[Bf-blender-cvs] [49f001cd3a] workspaces: Fix 'New Window' operator using name from screen, not layout

Julian Eisel noreply at git.blender.org
Fri Mar 17 11:41:27 CET 2017


Commit: 49f001cd3a156210b2cbc01f16b1b19f9dc8d681
Author: Julian Eisel
Date:   Fri Mar 17 11:40:22 2017 +0100
Branches: workspaces
https://developer.blender.org/rB49f001cd3a156210b2cbc01f16b1b19f9dc8d681

Fix 'New Window' operator using name from screen, not layout

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

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

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

diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index ff4e22ac05..da919d745c 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -847,17 +847,18 @@ struct EnumPropertyItem *wm_window_new_screen_itemf(
 	BKE_workspace_layout_iter_begin(layout, listbase->first)
 	{
 		bScreen *screen = BKE_workspace_layout_screen_get(layout);
+		const char *layout_name = BKE_workspace_layout_name_get(layout);
+
 		if (screen->winid) {
-			BLI_snprintf(active_screens[count_act_screens], sizeof(*active_screens), "%s (Duplicate)",
-			             screen->id.name + 2);
+			BLI_snprintf(active_screens[count_act_screens], sizeof(*active_screens), "%s (Duplicate)", layout_name);
 			tmp.name = active_screens[count_act_screens++];
 		}
 		else {
-			tmp.name = screen->id.name + 2;
+			tmp.name = layout_name;
 		}
 
 		tmp.value = value;
-		tmp.identifier = screen->id.name;
+		tmp.identifier = layout_name;
 		UI_id_icon_render(C, CTX_data_scene(C), &screen->id, true, false);
 		tmp.icon = BKE_icon_id_ensure(&screen->id);




More information about the Bf-blender-cvs mailing list