Commit: dc76cd65ccb3882858a4ef57328b7069f621bc35
Author: Julian Eisel
Date: Thu Jan 5 00:58:35 2017 +0100
Branches: workspaces
https://developer.blender.org/rBdc76cd65ccb3882858a4ef57328b7069f621bc35
Remove redundant Depsgraph update call
Scene can't be changed by changing a screen or workspace anymore.
===================================================================
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_intern.h
M source/blender/editors/screen/workspace_edit.c
===================================================================
diff --git a/source/blender/editors/screen/screen_edit.c
b/source/blender/editors/screen/screen_edit.c
index 159b111..7550f35 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1206,7 +1206,7 @@ bScreen *screen_set_find_associated_fullscreen(const Main
*bmain, bScreen *scree
/**
* Refresh data and make screen ready for drawing *after* activating it.
*/
-void screen_set_refresh(Main *bmain, bContext *C, wmWindow *win)
+void screen_set_refresh(bContext *C, wmWindow *win)
{
Scene *scene = WM_window_get_active_scene(win);
bScreen *sc = WM_window_get_active_screen(win);
@@ -1223,12 +1223,6 @@ void screen_set_refresh(Main *bmain, bContext *C,
wmWindow *win)
/* makes button hilites work */
WM_event_add_mousemove(C);
-
- /* Always do visible update since it's possible new screen will
- * have different layers visible in 3D view-ports.
- * This is possible because of view3d.lock_camera_and_layers option.
- */
- DAG_on_visible_update(bmain, false);
}
/**
@@ -1298,7 +1292,7 @@ bool ED_screen_set(bContext *C, bScreen *sc)
if (screen_old != screen_new) {
screen_set_prepare(C, win, screen_new, screen_old);
WM_window_set_active_screen(win, sc);
- screen_set_refresh(bmain, C, win);
+ screen_set_refresh(C, win);
}
return true;
diff --git a/source/blender/editors/screen/screen_intern.h
b/source/blender/editors/screen/screen_intern.h
index d9a28c0..d1b71c6 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -50,7 +50,7 @@ bScreen *screen_add(wmWindow *win, const char *name, const
int winsize_x, con
void screen_data_copy(bScreen *to, bScreen *from);
void screen_new_activate_refresh(const wmWindow *win, bScreen
*screen_new);
bScreen *screen_set_find_associated_fullscreen(const struct Main *bmain,
bScreen *screen);
-void screen_set_refresh(struct Main *bmain, struct bContext *C,
wmWindow *win);
+void screen_set_refresh(struct bContext *C, wmWindow *win);
bScreen *screen_set_ensure_valid(const struct Main *bmain, const wmWindow
*win, bScreen *screen_new);
void screen_set_prepare(struct bContext *C, wmWindow *win, bScreen
*screen_new, bScreen *screen_old);
ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2);
diff --git a/source/blender/editors/screen/workspace_edit.c
b/source/blender/editors/screen/workspace_edit.c
index 719e490..4557ccb 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -87,7 +87,7 @@ bool ED_workspace_change(bContext *C, wmWindowManager *wm,
wmWindow *win, WorkSp
if (screen_old != screen_new) {
screen_set_prepare(C, win, screen_new, screen_old);
WM_window_set_active_workspace(win, workspace_new);
- screen_set_refresh(bmain, C, win);
+ screen_set_refresh(C, win);
}
workspace_change_update_mode(workspace_old, workspace_new, C,
CTX_data_active_object(C), &wm->reports);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
