diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-07-23 22:42:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-23 22:42:15 +0400 |
| commit | 7275ba728df01a965706d1119b6bed7210820fa3 (patch) | |
| tree | bd9ab1b1ca02178b657432e8030cac661869c146 /source/blender/blenkernel/intern/scene.c | |
| parent | 318c975dcbe428cf61f41056e64c5083ffdb330e (diff) | |
fix for another case where object editmode data could be lost when switching scenes.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index fe52375617b..9d736bd92eb 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -512,6 +512,10 @@ void set_scene_bg(Scene *scene) /* 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); |