[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23533] trunk/blender/source/blender/ editors/object/object_edit.c: Fix #19453: rendering with mesh in edit mode would put the object

[Brecht Van Lommel]

Revision: 23533
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23533
Author:   blendix
Date:     2009-09-28 16:40:37 +0200 (Mon, 28 Sep 2009)

Log Message:
-----------
Fix #19453: rendering with mesh in edit mode would put the object
partially back in object mode, disabling e.g. X delete.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_edit.c

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c   2009-09-28 
14:33:38 UTC (rev 23532)
+++ trunk/blender/source/blender/editors/object/object_edit.c   2009-09-28 
14:40:37 UTC (rev 23533)
@@ -332,7 +332,7 @@
                if(freedata) free_editMball(obedit);
        }
 
-       /* freedata only 0 now on file saves */
+       /* freedata only 0 now on file saves and render */
        if(freedata) {
                ListBase pidlist;
                PTCacheID *pid;
@@ -357,10 +357,10 @@
                if(flag & EM_WAITCURSOR) waitcursor(0);
        
                WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, 
scene);
+
+               obedit->mode &= ~OB_MODE_EDIT;
+               ED_object_toggle_modes(C, obedit->restore_mode);
        }
-
-       obedit->mode &= ~OB_MODE_EDIT;
-       ED_object_toggle_modes(C, obedit->restore_mode);
 }
 
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs