[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57205] trunk/blender/source/blender/ editors/object/object_edit.c: fix [#35489] mode_set() not working in background mode, Scene change doesn't change mode either

[Campbell Barton]

Revision: 57205
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57205
Author:   campbellbarton
Date:     2013-06-02 22:21:45 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
fix [#35489] mode_set() not working in background mode, Scene change doesn't change mode either

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	2013-06-02 20:59:00 UTC (rev 57204)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2013-06-02 22:21:45 UTC (rev 57205)
@@ -382,6 +382,11 @@
 	if (flag & EM_WAITCURSOR) waitcursor(1);
 
 	if (ED_object_editmode_load_ex(obedit, freedata) == false) {
+		/* in rare cases (background mode) its possible active object
+		 * is flagged for editmode, without 'obedit' being set [#35489] */
+		if (UNLIKELY(scene->basact && (scene->basact->object->mode & OB_MODE_EDIT))) {
+			scene->basact->object->mode &= ~OB_MODE_EDIT;
+		}
 		if (flag & EM_WAITCURSOR) waitcursor(0);
 		return;
 	}