diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 05:19:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 05:19:52 +0300 |
| commit | a7355c32216e4b9a5b58837802d79a45f883f7ca (patch) | |
| tree | 01c2b0250c4494e2892fe5ebaaed678d003b2ebf /source/blender/windowmanager | |
| parent | bc23381a26b41df3ec03ca03e09852ce7141822a (diff) | |
WorksSpace: sync object-modes when changing scene
Note that this code will likely be generalized,
currently each new case is a little different though
so it's too early to move them into general functions.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 018318556e8..abce1b43140 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -2003,11 +2003,11 @@ Scene *WM_window_get_active_scene(const wmWindow *win) */ void WM_window_change_active_scene(Main *bmain, bContext *C, wmWindow *win, Scene *scene_new) { + WorkSpace *workspace = WM_window_get_active_workspace(win); const bScreen *screen = WM_window_get_active_screen(win); + Scene *scene_old = win->scene; - ED_scene_exit(C); - win->scene = scene_new; - ED_scene_changed_update(bmain, C, scene_new, screen); + ED_scene_change_update(bmain, C, win, screen, scene_old, scene_new); } WorkSpace *WM_window_get_active_workspace(const wmWindow *win) |