[Bf-blender-cvs] [fc54b5034a3] temp-dynamic-overrides: Merge remote-tracking branch 'origin/blender2.8' into temp-dynamic-overrides

[Dalai Felinto]

Commit: fc54b5034a3e0e49d64730bbf58ea85416301efa
Author: Dalai Felinto
Date:   Wed May 9 15:58:38 2018 +0200
Branches: temp-dynamic-overrides
https://developer.blender.org/rBfc54b5034a3e0e49d64730bbf58ea85416301efa

Merge remote-tracking branch 'origin/blender2.8' into temp-dynamic-overrides

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



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

diff --cc source/blender/makesrna/intern/rna_scene.c
index 900c651833e,24829c9fda4..3ef0faf31e7
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -6105,31 -6121,12 +6121,37 @@@ void RNA_def_scene(BlenderRNA *brna
  	RNA_def_property_struct_type(prop, "SceneCollection");
  	RNA_def_property_ui_text(prop, "Master Collection", "Collection that contains all other collections");
  
 +	/* Interface */
 +	prop = RNA_def_property(srna, "show_view_layer_overrides_scene_property", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SCE_DYN_OVERRIDE_HIDE_SCENE_PROPS);
 +	RNA_def_property_ui_text(prop,
 +	                         "Scene Properties",
 +	                         "Show scene properties overrides for active set");
 +	RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1);
 +	RNA_def_property_update(prop, NC_SCENE | ND_DYN_OVERRIDES, NULL);
 +
 +	prop = RNA_def_property(srna, "show_view_layer_overrides_affected_collections", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SCE_DYN_OVERRIDE_HIDE_COLLECTIONS);
 +	RNA_def_property_ui_text(prop,
 +	                         "Affected Collections",
 +	                         "Show affected collections overriden for active set");
 +	RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1);
 +	RNA_def_property_update(prop, NC_SCENE | ND_DYN_OVERRIDES, NULL);
 +
 +	prop = RNA_def_property(srna, "show_view_layer_overrides_collections_property", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SCE_DYN_OVERRIDE_HIDE_COLL_PROPS);
 +	RNA_def_property_ui_text(prop,
 +	                         "Collection Properties",
 +	                         "Show collection properties overrides for active set");
 +	RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1);
 +	RNA_def_property_update(prop, NC_SCENE | ND_DYN_OVERRIDES, NULL);
 +
+ 	/* Scene Display */
+ 	prop = RNA_def_property(srna, "display", PROP_POINTER, PROP_NONE);
+ 	RNA_def_property_pointer_sdna(prop, NULL, "display");
+ 	RNA_def_property_struct_type(prop, "SceneDisplay");
+ 	RNA_def_property_ui_text(prop, "Scene Display", "Scene display settings for 3d viewport");
+ 
  	/* Nestled Data  */
  	/* *** Non-Animated *** */
  	RNA_define_animate_sdna(false);