[Bf-blender-cvs] [c8d3ed6ae9] temp-workspace-multi-window: Fix crash when changing workspace

Julian Eisel noreply at git.blender.org
Mon Mar 6 16:34:26 CET 2017


Commit: c8d3ed6ae9a0b61d30d5d5bba2491c41ce5b484a
Author: Julian Eisel
Date:   Mon Mar 6 16:31:44 2017 +0100
Branches: temp-workspace-multi-window
https://developer.blender.org/rBc8d3ed6ae9a0b61d30d5d5bba2491c41ce5b484a

Fix crash when changing workspace

There are more issues when changing workspaces and I think I know
how to fix them, but it may need some further changes.

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

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

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

diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index b5c81caa93..3250e7acad 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -156,8 +156,6 @@ void BKE_workspace_hook_delete(Main *bmain, WorkSpaceHook *hook)
 
 void BKE_workspace_change_prepare(Main *bmain, WorkSpaceHook *workspace_hook, WorkSpace *workspace_new)
 {
-	BLI_freelistN(&workspace_hook->layouts);
-
 	for (WorkSpaceLayoutType *type = workspace_new->layout_types.first; type; type = type->next) {
 		bScreen *screen = BKE_screen_create_from_screen_data(bmain, type->vertbase, type->areabase, type->name);
 		WorkSpaceLayout *layout = BKE_workspace_layout_add_from_type(workspace_new, type, screen);




More information about the Bf-blender-cvs mailing list