[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29987] trunk/blender/source/blender/ editors: Fix #22694: rendering exits editmode.

[Brecht Van Lommel]

Revision: 29987
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29987
Author:   blendix
Date:     2010-07-05 14:52:47 +0200 (Mon, 05 Jul 2010)

Log Message:
-----------
Fix #22694: rendering exits editmode. Problem was due to incorrect fix for
bug #20091 in revision 24989, crash when rendering in metaball editmode.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24989

Modified Paths:
--------------
    trunk/blender/source/blender/editors/metaball/mball_edit.c
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c	2010-07-05 12:20:49 UTC (rev 29986)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c	2010-07-05 12:52:47 UTC (rev 29987)
@@ -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 @@
  * 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) */

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2010-07-05 12:20:49 UTC (rev 29986)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2010-07-05 12:52:47 UTC (rev 29987)
@@ -637,7 +637,7 @@
 	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