[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30840] trunk/blender/source/blender/ editors/screen/screen_edit.c: Fix #22996: switching scenes did not exit editmode, meaning changes

Brecht Van Lommel brecht at blender.org
Wed Jul 28 15:15:29 CEST 2010


Revision: 30840
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30840
Author:   blendix
Date:     2010-07-28 15:15:29 +0200 (Wed, 28 Jul 2010)

Log Message:
-----------
Fix #22996: switching scenes did not exit editmode, meaning changes
made were not visible in the other scene in object mode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2010-07-28 13:07:12 UTC (rev 30839)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2010-07-28 13:15:29 UTC (rev 30840)
@@ -51,6 +51,7 @@
 #include "WM_types.h"
 
 #include "ED_image.h"
+#include "ED_object.h"
 #include "ED_view3d.h"
 #include "ED_screen.h"
 #include "ED_screen_types.h"
@@ -1369,6 +1370,8 @@
 	bScreen *sc;
 	bScreen *curscreen= CTX_wm_screen(C);
 	
+	ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO);
+
 	for(sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) {
 		if((U.flag & USER_SCENEGLOBAL) || sc==curscreen) {
 			





More information about the Bf-blender-cvs mailing list