[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30668] trunk/blender/source/blender/ blenkernel/intern/scene.c: fix for another case where object editmode data could be lost when switching scenes .

[Campbell Barton]

Revision: 30668
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30668
Author:   campbellbarton
Date:     2010-07-23 20:42:15 +0200 (Fri, 23 Jul 2010)

Log Message:
-----------
fix for another case where object editmode data could be lost when switching scenes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2010-07-23 18:30:14 UTC (rev 30667)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2010-07-23 18:42:15 UTC (rev 30668)
@@ -512,6 +512,10 @@
 	/* check for cyclic sets, for reading old files but also for definite security (py?) */
 	scene_check_setscene(scene);
 	
+	/* can happen when switching modes in other scenes */
+	if(scene->obedit && !(scene->obedit->mode & OB_MODE_EDIT))
+		scene->obedit= NULL;
+
 	/* deselect objects (for dataselect) */
 	for(ob= G.main->object.first; ob; ob= ob->id.next)
 		ob->flag &= ~(SELECT|OB_FROMGROUP);