diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-28 17:15:29 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-28 17:15:29 +0400 |
commit | 114b86f6d7781836635799deb12631a4f36c4eee (patch) | |
tree | fe597e6cfadd16a4d1aa1d462e5d78a96a23538a /source/blender/editors/screen/screen_edit.c | |
parent | d44a2b5b1b782bd89b562843806ccad7af0dd25f (diff) |
Fix #22996: switching scenes did not exit editmode, meaning changes
made were not visible in the other scene in object mode.
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 952f34ae2be..5082992aaba 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -51,6 +51,7 @@ #include "WM_types.h" #include "ED_image.h" +#include "ED_object.h" #include "ED_view3d.h" #include "ED_screen.h" #include "ED_screen_types.h" @@ -1369,6 +1370,8 @@ void ED_screen_set_scene(bContext *C, Scene *scene) bScreen *sc; bScreen *curscreen= CTX_wm_screen(C); + ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO); + for(sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { if((U.flag & USER_SCENEGLOBAL) || sc==curscreen) { |