[Bf-blender-cvs] [7f173ae] workspaces: Remove "Use Global Scene" option

[Julian Eisel]

Commit: 7f173aea9f595cc1f1fa949df682212a46974043
Author: Julian Eisel
Date:   Thu Jan 5 01:14:56 2017 +0100
Branches: workspaces
https://developer.blender.org/rB7f173aea9f595cc1f1fa949df682212a46974043

Remove "Use Global Scene" option

This option isn't really needed now that scenes are only on window level.

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

M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 1dc6c7a..17f1ff6 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -594,7 +594,7 @@ typedef enum eUserPref_Flag {
 /*	USER_AUTOGRABGRID		= (1 << 1),	deprecated */
 /*	USER_AUTOROTGRID		= (1 << 2),	deprecated */
 /*	USER_AUTOSIZEGRID		= (1 << 3),	deprecated */
-	USER_SCENEGLOBAL		= (1 << 4),
+/*	USER_SCENEGLOBAL         = (1 << 4), deprecated */
 	USER_TRACKBALL			= (1 << 5),
 /*	USER_DUPLILINK		= (1 << 6),	deprecated */
 /*	USER_FSCOLLUM			= (1 << 7),	deprecated */
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 0b17e67..bc7e097 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3340,11 +3340,6 @@ static void rna_def_userdef_view(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Display Object Info", "Display objects name and frame number in 3D view");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
-	prop = RNA_def_property(srna, "use_global_scene", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_SCENEGLOBAL);
-	RNA_def_property_ui_text(prop, "Global Scene", "Force the current Scene to be displayed in all Screens");
-	RNA_def_property_update(prop, 0, "rna_userdef_update");
-
 	prop = RNA_def_property(srna, "show_large_cursors", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "curssize", 0);
 	RNA_def_property_ui_text(prop, "Large Cursors", "Use large mouse cursors when available");