diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-05 16:52:47 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-05 16:52:47 +0400 |
commit | feefb4d2d25a1e09faaebadf53151ce8810eca04 (patch) | |
tree | 75ab5bedfdc06d5fdd3d3c4106b7a08a15e37f41 /source/blender | |
parent | efeb8148c8dc03a08121767492e34fa31c70d72b (diff) |
Fix #22694: rendering exits editmode. Problem was due to incorrect fix for
bug #20091 in revision 24989, crash when rendering in metaball editmode.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/metaball/mball_edit.c | 8 | ||||
-rw-r--r-- | source/blender/editors/render/render_internal.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index d937b717ee1..11534f57f75 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -60,6 +60,10 @@ /* This function is used to free all MetaElems from MetaBall */ void free_editMball(Object *obedit) { + MetaBall *mb = (MetaBall*)obedit->data; + + mb->editelems= NULL; + mb->lastelem= NULL; } /* This function is called, when MetaBall Object is @@ -84,10 +88,6 @@ void make_editMball(Object *obedit) * from object->data->edit_elems to object->data->elems. */ void load_editMball(Object *obedit) { - MetaBall *mb = (MetaBall*)obedit->data; - - mb->editelems= NULL; - mb->lastelem= NULL; } /* Add metaelem primitive to metaball object (which is in edit mode) */ diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 8f4b02b8d64..7110c3aa7a7 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -637,7 +637,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) multires_force_render_update(CTX_data_active_object(C)); /* get editmode results */ - ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO); /* 0 = does not exit editmode */ + ED_object_exit_editmode(C, 0); /* 0 = does not exit editmode */ // store spare // get view3d layer, local layer, make this nice api call to render |