[Bf-blender-cvs] [8887988b154] master: RNA: remove Screen.layout_name

Campbell Barton noreply at git.blender.org
Tue Mar 5 15:49:10 CET 2019


Commit: 8887988b1543a794ba5d0c72db95284936969c0c
Author: Campbell Barton
Date:   Wed Mar 6 01:48:43 2019 +1100
Branches: master
https://developer.blender.org/rB8887988b1543a794ba5d0c72db95284936969c0c

RNA: remove Screen.layout_name

This is no longer used.

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

M	source/blender/makesrna/intern/rna_screen.c

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

diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c
index 0f363810ed2..33e3da6d86c 100644
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@ -95,44 +95,6 @@ static int rna_region_alignment_get(PointerRNA *ptr)
 	return (region->alignment & ~RGN_SPLIT_PREV);
 }
 
-static void rna_Screen_layout_name_get(PointerRNA *ptr, char *value)
-{
-	const bScreen *screen = ptr->data;
-	const WorkSpaceLayout *layout = BKE_workspace_layout_find_global(G_MAIN, screen, NULL);
-
-	if (layout) {
-		const char *name = BKE_workspace_layout_name_get(layout);
-		strcpy(value, name);
-	}
-	else {
-		value[0] = '\0';
-	}
-}
-
-static int rna_Screen_layout_name_length(PointerRNA *ptr)
-{
-	const bScreen *screen = ptr->data;
-	const WorkSpaceLayout *layout = BKE_workspace_layout_find_global(G_MAIN, screen, NULL);
-
-	if (layout) {
-		const char *name = BKE_workspace_layout_name_get(layout);
-		return strlen(name);
-	}
-
-	return 0;
-}
-
-static void rna_Screen_layout_name_set(PointerRNA *ptr, const char *value)
-{
-	bScreen *screen = ptr->data;
-	WorkSpace *workspace;
-	WorkSpaceLayout *layout = BKE_workspace_layout_find_global(G_MAIN, screen, &workspace);
-
-	if (layout) {
-		BKE_workspace_layout_name_set(workspace, layout, value);
-	}
-}
-
 static bool rna_Screen_fullscreen_get(PointerRNA *ptr)
 {
 	bScreen *sc = (bScreen *)ptr->data;
@@ -530,11 +492,6 @@ static void rna_def_screen(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Screen", "Screen data-block, defining the layout of areas in a window");
 	RNA_def_struct_ui_icon(srna, ICON_WORKSPACE);
 
-	prop = RNA_def_property(srna, "layout_name", PROP_STRING, PROP_NONE);
-	RNA_def_property_string_funcs(prop, "rna_Screen_layout_name_get", "rna_Screen_layout_name_length",
-	                              "rna_Screen_layout_name_set");
-	RNA_def_property_ui_text(prop, "Layout Name", "The name of the layout that refers to the screen");
-
 	/* collections */
 	prop = RNA_def_property(srna, "areas", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "areabase", NULL);



More information about the Bf-blender-cvs mailing list