[Bf-blender-cvs] [ea3b1f054a] temp-workspace-multi-window: Fix errors in areabase/vertbase storage

Julian Eisel noreply at git.blender.org
Mon Mar 6 14:15:32 CET 2017


Commit: ea3b1f054a1f3b16796409629c4358bdcecf7af0
Author: Julian Eisel
Date:   Mon Mar 6 14:13:42 2017 +0100
Branches: temp-workspace-multi-window
https://developer.blender.org/rBea3b1f054a1f3b16796409629c4358bdcecf7af0

Fix errors in areabase/vertbase storage

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

M	source/blender/blenkernel/intern/workspace.c
M	source/blender/windowmanager/intern/wm_window.c

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

diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index c3c1f39ade..5a07e7c09c 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -353,7 +353,7 @@ const char *BKE_workspace_layout_type_name_get(const WorkSpaceLayoutType *layout
 
 ListBase *BKE_workspace_layout_type_vertbase_get(const WorkSpaceLayoutType *type)
 {
-	return type->areabase;
+	return type->vertbase;
 }
 ListBase *BKE_workspace_layout_type_areabase_get(const WorkSpaceLayoutType *type)
 {
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index f0ff1d2018..f3d5d9168f 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -679,7 +679,7 @@ wmWindow *WM_window_open_temp(bContext *C, const rcti *rect_init, int type)
 		/* add new screen layout */
 		WorkSpace *workspace = WM_window_get_active_workspace(win);
 		WorkSpaceLayout *layout;
-		ListBase vertbase, areabase;
+		ListBase vertbase = {}, areabase = {};
 
 		ED_screen_empty_data_create(win->sizex, win->sizey, &vertbase, &areabase);
 		ED_workspace_layout_add(workspace, &wm->windows, "temp", &vertbase, &areabase);




More information about the Bf-blender-cvs mailing list