[Bf-blender-cvs] [4df2179f191] blender2.8: Cleanup: rename 'screen_changed_update'

Campbell Barton noreply at git.blender.org
Fri Mar 2 03:20:54 CET 2018


Commit: 4df2179f19152243f0c5eb95e34c191659251546
Author: Campbell Barton
Date:   Fri Mar 2 13:23:45 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB4df2179f19152243f0c5eb95e34c191659251546

Cleanup: rename 'screen_changed_update'

Match 'workspace_change_update'.

===================================================================

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

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index a3287b2be51..08f2242f961 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -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;
 	}
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h
index df92ab86ef2..6d0a9f1e7d0 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -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);
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index 59e24632892..ae183aeb72a 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -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);
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index abce1b43140..d9a3f4f9bde 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -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;



More information about the Bf-blender-cvs mailing list