[Bf-blender-cvs] [10f0f4b06f9] blender2.8: Fix opening new windows would try to open global areas twice
Julian Eisel
noreply at git.blender.org
Mon Apr 23 22:19:20 CEST 2018
Commit: 10f0f4b06f9e09082656b483c17520118816b0d7
Author: Julian Eisel
Date: Mon Apr 23 22:13:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB10f0f4b06f9e09082656b483c17520118816b0d7
Fix opening new windows would try to open global areas twice
Would cause weird & broken areas below the topbar.
===================================================================
M source/blender/editors/screen/screen_ops.c
M source/blender/windowmanager/intern/wm.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 243f0f5720b..6ed56e91a0f 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1045,7 +1045,6 @@ static int area_dupli_invoke(bContext *C, wmOperator *op, const wmEvent *event)
layout_new = ED_workspace_layout_add(workspace, newwin, BKE_workspace_layout_name_get(layout_old));
newsc = BKE_workspace_layout_screen_get(layout_new);
WM_window_set_active_layout(newwin, workspace, layout_new);
- ED_screen_global_areas_create(newwin);
/* copy area to new screen */
ED_area_data_copy((ScrArea *)newsc->areabase.first, sa, true);
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 91e47b67130..dc941078fc2 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -470,7 +470,6 @@ void wm_add_default(Main *bmain, bContext *C)
WM_window_set_active_workspace(win, workspace);
WM_window_set_active_layout(win, workspace, layout);
screen->winid = win->winid;
- ED_screen_global_areas_create(win);
wm->winactive = win;
wm->file_saved = 1;
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 166d97d6b5e..62f377e5f2e 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -304,7 +304,6 @@ wmWindow *wm_window_copy(bContext *C, wmWindow *win_src, const bool duplicate_la
WM_window_set_active_workspace(win_dst, workspace);
layout_new = duplicate_layout ? ED_workspace_layout_duplicate(workspace, layout_old, win_dst) : layout_old;
WM_window_set_active_layout(win_dst, workspace, layout_new);
- ED_screen_global_areas_create(win_dst);
win_dst->drawmethod = U.wmdrawmethod;
@@ -1017,7 +1016,6 @@ int wm_window_new_exec(bContext *C, wmOperator *op)
screen_new->winid = win_dst->winid;
CTX_wm_window_set(C, win_dst);
- ED_screen_global_areas_create(win_dst);
ED_screen_refresh(CTX_wm_manager(C), win_dst);
}
More information about the Bf-blender-cvs
mailing list