griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Campbell Barton
2010-07-23 18:30:14 +00:00
parent 4e62175989
commit 318c975dcb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/object/object_edit.c
View File

@@ -435,7 +435,12 @@ void ED_object_enter_editmode(bContext *C, int flag)
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) {