From e6d11c6ce66f94549d1fe896c59b67564ae19d68 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 8 May 2018 15:57:20 +0200 Subject: Collections: remove per collection and view layer engine overrides. This will be handled by the new view layer override system which will store data elsewhere, removing the code already for easier refactoring. --- source/blender/makesdna/DNA_layer_types.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source/blender/makesdna/DNA_layer_types.h') diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index b3309a2e10f..f185db1d677 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -42,15 +42,8 @@ typedef struct Base { struct Object *object; unsigned int lay; int flag_legacy; - struct IDProperty *collection_properties; /* used by depsgraph, flushed from collection-tree */ } Base; -typedef struct CollectionOverride { - struct CollectionOverride *next, *prev; - char name[64]; /* MAX_NAME */ - /* TODO proper data */ -} CollectionOverride; - typedef struct ViewLayerEngineData { struct ViewLayerEngineData *next, *prev; struct DrawEngineType *engine_type; @@ -66,10 +59,7 @@ typedef struct LayerCollection { short flag_evaluated; short pad[2]; ListBase object_bases; /* (ObjectBase *)LinkData->data - synced with collection->objects */ - ListBase overrides; ListBase layer_collections; /* synced with collection->collections */ - struct IDProperty *properties; /* overrides */ - struct IDProperty *properties_evaluated; } LayerCollection; typedef struct ViewLayer { @@ -82,7 +72,6 @@ typedef struct ViewLayer { struct SceneStats *stats; /* default allocated now */ struct Base *basact; ListBase layer_collections; /* LayerCollection */ - struct IDProperty *properties; /* overrides */ struct IDProperty *properties_evaluated; /* Old SceneRenderLayer data. */ -- cgit v1.2.3