From 30b619e76529a5ca99f96683f1b4a512d18cd519 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 5 Oct 2015 09:10:07 +1100
Subject: [PATCH] Revert "Fix T46365: Export UV Layout to PNG not working
(missing context messages part)."
This reverts commit e1d8c70bbb5776041383335f986b28b33d18f8ff.
Prefer not to have speculative fixes.
The intention here is not to use the context at all,
even if doing so fixes the crash -
it may then fail silently by mixing data from different contexts,
causing further complications which are much harder to debug.
---
io_mesh_uv_layout/__init__.py | 4 ++--
io_mesh_uv_layout/export_uv_eps.py | 2 +-
io_mesh_uv_layout/export_uv_png.py | 5 ++---
io_mesh_uv_layout/export_uv_svg.py | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/io_mesh_uv_layout/__init__.py b/io_mesh_uv_layout/__init__.py
index 811430dfb..30dff949f 100644
--- a/io_mesh_uv_layout/__init__.py
+++ b/io_mesh_uv_layout/__init__.py
@@ -21,7 +21,7 @@
bl_info = {
"name": "UV Layout",
"author": "Campbell Barton, Matt Ebb",
- "version": (1, 1, 2),
+ "version": (1, 1, 1),
"blender": (2, 75, 0),
"location": "Image-Window > UVs > Export UV Layout",
"description": "Export the UV layout as a 2D graphic",
@@ -199,7 +199,7 @@ class ExportUVLayout(bpy.types.Operator):
else:
mesh = obj.data
- func(fw, context, mesh, self.size[0], self.size[1], self.opacity,
+ func(fw, mesh, self.size[0], self.size[1], self.opacity,
lambda: self._face_uv_iter(context, mesh, self.tessellated))
if self.modified:
diff --git a/io_mesh_uv_layout/export_uv_eps.py b/io_mesh_uv_layout/export_uv_eps.py
index 271ab5ef1..a15dc2662 100644
--- a/io_mesh_uv_layout/export_uv_eps.py
+++ b/io_mesh_uv_layout/export_uv_eps.py
@@ -21,7 +21,7 @@
import bpy
-def write(fw, context, mesh, image_width, image_height, opacity, face_iter_func):
+def write(fw, mesh, image_width, image_height, opacity, face_iter_func):
fw("%!PS-Adobe-3.0 EPSF-3.0\n")
fw("%%%%Creator: Blender %s\n" % bpy.app.version_string)
fw("%%Pages: 1\n")
diff --git a/io_mesh_uv_layout/export_uv_png.py b/io_mesh_uv_layout/export_uv_png.py
index c5ba3a3b3..5da543ccf 100644
--- a/io_mesh_uv_layout/export_uv_png.py
+++ b/io_mesh_uv_layout/export_uv_png.py
@@ -21,7 +21,7 @@
import bpy
-def write(fw, context, mesh_source, image_width, image_height, opacity, face_iter_func):
+def write(fw, mesh_source, image_width, image_height, opacity, face_iter_func):
filepath = fw.__self__.name
fw.__self__.close()
@@ -133,8 +133,7 @@ def write(fw, context, mesh_source, image_width, image_height, opacity, face_ite
scene.update()
- data_context = context.copy()
- data_context.update((("blend_data", bpy.context.blend_data), ("scene", scene)))
+ data_context = {"blend_data": bpy.context.blend_data, "scene": scene}
bpy.ops.render.render(data_context, write_still=True)
# cleanup
diff --git a/io_mesh_uv_layout/export_uv_svg.py b/io_mesh_uv_layout/export_uv_svg.py
index d23782190..764f0d341 100644
--- a/io_mesh_uv_layout/export_uv_svg.py
+++ b/io_mesh_uv_layout/export_uv_svg.py
@@ -21,7 +21,7 @@
import bpy
-def write(fw, context, mesh, image_width, image_height, opacity, face_iter_func):
+def write(fw, mesh, image_width, image_height, opacity, face_iter_func):
# for making an XML compatible string
from xml.sax.saxutils import escape
from os.path import basename
--
GitLab