[Bf-blender-cvs] [f2c6c831e3d] blender2.8: Layer: remove no longer used settings

[Dalai Felinto]

Commit: f2c6c831e3d47599157ca529e2cac3c091062bb4
Author: Dalai Felinto
Date:   Thu Mar 30 18:40:31 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf2c6c831e3d47599157ca529e2cac3c091062bb4

Layer: remove no longer used settings

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

M	source/blender/blenkernel/intern/layer.c
M	source/blender/makesdna/DNA_layer_types.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index a593d400f56..c8da1d201e3 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -919,7 +919,7 @@ static LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, Scene
 	BLI_addtail(lb, lc);
 
 	lc->scene_collection = sc;
-	lc->flag = COLLECTION_VISIBLE + COLLECTION_SELECTABLE + COLLECTION_FOLDED;
+	lc->flag = COLLECTION_VISIBLE + COLLECTION_SELECTABLE;
 
 	lc->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
 	collection_engine_settings_init(lc->properties, false);
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 2ea0638acfb..fa419103a77 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -59,8 +59,6 @@ typedef struct LayerCollection {
 	ListBase object_bases;      /* (ObjectBase *)LinkData->data - synced with collection->objects and collection->filter_objects */
 	ListBase overrides;
 	ListBase layer_collections; /* synced with collection->collections */
-	ListBase engine_settings; /* CollectionEngineSettings */
-	ListBase mode_settings; /* CollectionModeSettings */
 	struct IDProperty *properties;  /* overrides */
 } LayerCollection;
 
@@ -100,7 +98,6 @@ enum {
 enum {
 	COLLECTION_VISIBLE    = (1 << 0),
 	COLLECTION_SELECTABLE = (1 << 1),
-	COLLECTION_FOLDED     = (1 << 2),
 };
 
 /* SceneLayer->flag */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 46bfc58f2ad..fb83726d1d3 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -6109,12 +6109,6 @@ static void rna_def_layer_collection(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Hide Selectable", "Restrict selection");
 	RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollection_hide_select_update");
 
-	prop = RNA_def_property(srna, "is_unfolded", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", COLLECTION_FOLDED);
-	RNA_def_property_ui_icon(prop, ICON_RIGHTARROW, 1);
-	RNA_def_property_ui_text(prop, "Folded", "Folded collection");
-	RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, NULL);
-
 	/* TODO_LAYER_OVERRIDE */
 }