[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30667] trunk/blender/source/blender/ editors/object/object_edit.c: bugfix [#22954] Crash going edit mode on an object linked in another scene ( Kino Bug Reporting Sprint :)

[Campbell Barton]

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

Log Message:
-----------
bugfix [#22954] Crash going edit mode on an object linked in another scene (Kino Bug Reporting Sprint :)

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	2010-07-23 18:00:37 UTC (rev 30666)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2010-07-23 18:30:14 UTC (rev 30667)
@@ -435,7 +435,12 @@
 	if(flag & EM_WAITCURSOR) waitcursor(1);
 
 	ob->restore_mode = ob->mode;
-	ED_object_toggle_modes(C, ob->mode);
+
+	/* note, when switching scenes the object can have editmode data but
+	 * not be scene->obedit: bug 22954, this avoids calling self eternally */
+	if((ob->restore_mode & OB_MODE_EDIT)==0)
+		ED_object_toggle_modes(C, ob->mode);
+
 	ob->mode= OB_MODE_EDIT;
 	
 	if(ob->type==OB_MESH) {