Skip to content
Snippets Groups Projects
Commit 2d048308 authored by Campbell Barton's avatar Campbell Barton
Browse files

remove use of ob.update_from_editmode() since editmode meshes don't get access...

remove use of ob.update_from_editmode() since editmode meshes don't get access to customdata layers. 
parent 7e6e45d7
No related branches found
No related tags found
No related merge requests found
......@@ -197,7 +197,8 @@ def save(operator,
if not obj:
raise Exception("Error, Select 1 active object")
obj.update_from_editmode()
if bpy.ops.object.mode_set.poll():
bpy.ops.object.mode_set(mode='OBJECT')
if use_mesh_modifiers and obj.modifiers:
mesh = obj.to_mesh(scene, True, 'PREVIEW')
......
......@@ -172,7 +172,9 @@ class ExportUVLayout(bpy.types.Operator):
def execute(self, context):
obj = context.active_object
obj.update_from_editmode()
is_editmode = (obj.mode == 'EDIT')
if is_editmode:
bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
mode = self.mode
......@@ -202,6 +204,9 @@ class ExportUVLayout(bpy.types.Operator):
if self.modified:
bpy.data.meshes.remove(mesh)
if is_editmode:
bpy.ops.object.mode_set(mode='EDIT', toggle=False)
file.close()
return {'FINISHED'}
......
......@@ -997,6 +997,9 @@ def save(operator,
if global_matrix is None:
global_matrix = mathutils.Matrix()
if bpy.ops.object.mode_set.poll():
bpy.ops.object.mode_set(mode='OBJECT')
# Initialize the main chunk (primary):
primary = _3ds_chunk(PRIMARY)
# Add version chunk:
......@@ -1025,8 +1028,6 @@ def save(operator,
objects = (ob for ob in scene.objects if ob.is_visible(scene))
for ob in objects:
ob.update_from_editmode()
# get derived objects
free, derived = create_derived_objects(scene, ob)
......
......@@ -678,7 +678,6 @@ def _write(context, filepath,
scene = context.scene
# Exit edit mode before exporting, so current object states are exported properly.
# use this over obj.update_from_editmode() because of animation export.
if bpy.ops.object.mode_set.poll():
bpy.ops.object.mode_set(mode='OBJECT')
......
......@@ -177,10 +177,16 @@ def save_object(fw, global_matrix,
assert(obj.type == 'MESH')
if use_mesh_modifiers:
obj.update_from_editmode()
is_editmode = (obj.mode == 'EDIT')
if is_editmode:
bpy.ops.object.editmode_toggle()
me = obj.to_mesh(scene, True, 'PREVIEW', calc_tessface=False)
bm = bmesh.new()
bm.from_mesh(me)
if is_editmode:
bpy.ops.object.editmode_toggle()
else:
me = obj.data
if obj.mode == 'EDIT':
......
......@@ -1582,10 +1582,8 @@ def save(operator, context, filepath="",
bpy.path.ensure_ext(filepath, '.x3dz' if use_compress else '.x3d')
edit_object = context.edit_object
if edit_object:
edit_object.update_from_editmode()
del edit_object
if bpy.ops.object.mode_set.poll():
bpy.ops.object.mode_set(mode='OBJECT')
if use_compress:
file = gzip_open_utf8(filepath, 'w')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment