[Bf-blender-cvs] [3128fe45919] master: Tool System: don't unlink tools when changing workspaces

Campbell Barton noreply at git.blender.org
Thu Jun 27 03:18:34 CEST 2019


Commit: 3128fe45919c69feb17d0dd5ec9850e58c42f446
Author: Campbell Barton
Date:   Thu Jun 27 11:03:20 2019 +1000
Branches: master
https://developer.blender.org/rB3128fe45919c69feb17d0dd5ec9850e58c42f446

Tool System: don't unlink tools  when changing workspaces

Caused gizmos to be lost with multiple main windows whenever one of them
switched workspaces.

Rely on tool gizmos poll function to unlink to gizmo.

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

M	source/blender/editors/screen/workspace_edit.c

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

diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index 6030b6fded5..f4138dd7847 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -183,9 +183,6 @@ bool ED_workspace_change(WorkSpace *workspace_new, bContext *C, wmWindowManager
 
   BLI_assert(CTX_wm_workspace(C) == workspace_new);
 
-  WM_toolsystem_unlink_all(C, workspace_old);
-  /* Area initialization will initialize based on the new workspace. */
-
   /* Automatic mode switching. */
   if (workspace_new->object_mode != workspace_old->object_mode) {
     ED_object_mode_generic_enter(C, workspace_new->object_mode);



More information about the Bf-blender-cvs mailing list