[Bf-blender-cvs] [a65880dc69] workspaces: Fix layout being duplicated when activating already active workspace

Julian Eisel noreply at git.blender.org
Wed Mar 15 12:08:29 CET 2017


Commit: a65880dc696b653897c7971c8e8e8e840c489208
Author: Julian Eisel
Date:   Wed Mar 15 12:07:38 2017 +0100
Branches: workspaces
https://developer.blender.org/rBa65880dc696b653897c7971c8e8e8e840c489208

Fix layout being duplicated when activating already active workspace

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

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

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

diff --git a/source/blender/editors/workspace/workspace_edit.c b/source/blender/editors/workspace/workspace_edit.c
index c950b72139..23f7120be0 100644
--- a/source/blender/editors/workspace/workspace_edit.c
+++ b/source/blender/editors/workspace/workspace_edit.c
@@ -118,6 +118,11 @@ bool ED_workspace_change(bContext *C, wmWindowManager *wm, wmWindow *win, WorkSp
 	WorkSpaceLayout *layout_new = BKE_workspace_layouts_get(workspace_new)->first;
 	bScreen *screen_new = BKE_workspace_layout_screen_get(layout_new);
 
+	if (workspace_old == workspace_new) {
+		/* Could also return true, everything that needs to be done was done (nothing :P), but nothing changed */
+		return false;
+	}
+
 	if (screen_new->winid) {
 		/* screen is already used */
 		layout_new = ED_workspace_layout_duplicate(workspace_new, layout_new, win);




More information about the Bf-blender-cvs mailing list