Cleanup: rename 'screen_changed_update'
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Mar 2018 02:23:45 +0000 (13:23 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Mar 2018 02:25:21 +0000 (13:25 +1100)
Match 'workspace_change_update'.

source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_intern.h
source/blender/editors/screen/workspace_edit.c
source/blender/windowmanager/intern/wm_window.c

index a3287b2be510326928fecc749b4adb0bdc6aa804..08f2242f9613d71e6b5c1df18628656b74314ac9 100644 (file)
@@ -1238,7 +1238,7 @@ bScreen *screen_change_prepare(bScreen *screen_old, bScreen *screen_new, Main *b
        return NULL;
 }
 
-void screen_changed_update(bContext *C, wmWindow *win, bScreen *sc)
+void screen_change_update(bContext *C, wmWindow *win, bScreen *sc)
 {
        Scene *scene = WM_window_get_active_scene(win);
        WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
@@ -1275,7 +1275,7 @@ bool ED_screen_change(bContext *C, bScreen *sc)
        if (screen_new) {
                WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
                WM_window_set_active_screen(win, workspace, sc);
-               screen_changed_update(C, win, screen_new);
+               screen_change_update(C, win, screen_new);
 
                return true;
        }
index df92ab86ef2f67d4c8438f8721797fc0b2950dc2..6d0a9f1e7d0256dd08f7c11a1dc1cade3998eadf 100644 (file)
@@ -50,7 +50,7 @@ void        region_toggle_hidden(struct bContext *C, ARegion *ar, const bool do_
 bScreen    *screen_add(const char *name, const int winsize_x, const int winsize_y);
 void        screen_data_copy(bScreen *to, bScreen *from);
 void        screen_new_activate_prepare(const wmWindow *win, bScreen *screen_new);
-void        screen_changed_update(struct bContext *C, wmWindow *win, bScreen *sc);
+void        screen_change_update(struct bContext *C, wmWindow *win, bScreen *sc);
 bScreen    *screen_change_prepare(bScreen *screen_old, bScreen *screen_new, struct Main *bmain, struct bContext *C, wmWindow *win);
 ScrEdge    *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2);
 ScrArea    *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge);
index 59e2463289215c3bcf4bdc0a2fdf36042eafd4ee..ae183aeb72a1a014a55e0496e2fc411dbaa5dbf4 100644 (file)
@@ -208,7 +208,7 @@ bool ED_workspace_change(
                WM_window_set_active_workspace(win, workspace_new);
 
                /* update screen *after* changing workspace - which also causes the actual screen change */
-               screen_changed_update(C, win, screen_new);
+               screen_change_update(C, win, screen_new);
                workspace_change_update(workspace_new, workspace_old, C);
 
                BLI_assert(BKE_workspace_view_layer_get(workspace_new, CTX_data_scene(C)) != NULL);
index abce1b431403c869994eafff18ebad7bb08ab9ac..d9a3f4f9bde46b024f06294f2b6da41908dfb068 100644 (file)
@@ -2003,7 +2003,6 @@ 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;