griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Layer: remove no longer used settings

Browse Source
This commit is contained in:
Dalai Felinto
2017-03-30 18:40:31 +02:00
parent ce3c7e8ff5
commit f2c6c831e3
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/layer.c
View File

@@ -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);

3
source/blender/makesdna/DNA_layer_types.h
View File

@@ -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 */

6
source/blender/makesrna/intern/rna_scene.c
View File

@@ -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 */
}