Differential D2927 Diff 9587 source/blender/makesdna/DNA_layer_types.h

Changeset View

Standalone View

source/blender/makesdna/DNA_layer_types.h

	Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
	} Base;			} Base;

	typedef struct CollectionOverride {			typedef struct CollectionOverride {
	struct CollectionOverride next, prev;			struct CollectionOverride next, prev;
	char name[64]; /* MAX_NAME */			char name[64]; /* MAX_NAME */
	/* TODO proper data */			/* TODO proper data */
	} CollectionOverride;			} CollectionOverride;

	typedef struct SceneLayerEngineData {			typedef struct ViewLayerEngineData {
	struct SceneLayerEngineData next, prev;			struct ViewLayerEngineData next, prev;
	struct DrawEngineType *engine_type;			struct DrawEngineType *engine_type;
	void *storage;			void *storage;
	void (free)(void storage);			void (free)(void storage);
	} SceneLayerEngineData;			} ViewLayerEngineData;

	typedef struct LayerCollection {			typedef struct LayerCollection {
	struct LayerCollection next, prev;			struct LayerCollection next, prev;
	struct SceneCollection *scene_collection;			struct SceneCollection *scene_collection;
	short flag;			short flag;
	/* TODO(sergey): Get rid of this once we've got CoW in DEG, */			/* TODO(sergey): Get rid of this once we've got CoW in DEG, */
	short flag_evaluated;			short flag_evaluated;
	short pad[2];			short pad[2];
	ListBase object_bases; /* (ObjectBase )LinkData->data - synced with collection->objects and collection->filter_objects /			ListBase object_bases; /* (ObjectBase )LinkData->data - synced with collection->objects and collection->filter_objects /
	ListBase overrides;			ListBase overrides;
	ListBase layer_collections; /* synced with collection->collections */			ListBase layer_collections; /* synced with collection->collections */
	struct IDProperty properties; / overrides */			struct IDProperty properties; / overrides */
	struct IDProperty *properties_evaluated;			struct IDProperty *properties_evaluated;
	} LayerCollection;			} LayerCollection;

	typedef struct SceneLayer {			typedef struct ViewLayer {
	struct SceneLayer next, prev;			struct ViewLayer next, prev;
	char name[64]; /* MAX_NAME */			char name[64]; /* MAX_NAME */
	short active_collection;			short active_collection;
	short flag;			short flag;
	short pad[2];			short pad[2];
	ListBase object_bases; /* ObjectBase */			ListBase object_bases; /* ObjectBase */
	struct SceneStats stats; / default allocated now */			struct SceneStats stats; / default allocated now */
	struct Base *basact;			struct Base *basact;
	ListBase layer_collections; /* LayerCollection */			ListBase layer_collections; /* LayerCollection */
	struct IDProperty properties; / overrides */			struct IDProperty properties; / overrides */
	struct IDProperty *properties_evaluated;			struct IDProperty *properties_evaluated;

	/* Old SceneRenderLayer data. */			/* Old SceneRenderLayer data. */
	int layflag;			int layflag;
	int passflag; /* pass_xor has to be after passflag */			int passflag; /* pass_xor has to be after passflag */
	int pass_xor;			int pass_xor;
	float pass_alpha_threshold;			float pass_alpha_threshold;

	struct IDProperty id_properties; / Equivalent to datablocks ID properties. */			struct IDProperty id_properties; / Equivalent to datablocks ID properties. */

	struct FreestyleConfig freestyle_config;			struct FreestyleConfig freestyle_config;

	/* Runtime data */			/* Runtime data */
	ListBase drawdata; /* SceneLayerEngineData */			ListBase drawdata; /* ViewLayerEngineData */
	} SceneLayer;			} ViewLayer;

	typedef struct SceneCollection {			typedef struct SceneCollection {
	struct SceneCollection next, prev;			struct SceneCollection next, prev;
	char name[64]; /* MAX_NAME */			char name[64]; /* MAX_NAME */
	char filter[64]; /* MAX_NAME */			char filter[64]; /* MAX_NAME */
	int active_object_index; /* for UI */			int active_object_index; /* for UI */
	int pad;			int pad;
	ListBase objects; /* (Object )LinkData->data /			ListBase objects; /* (Object )LinkData->data /
	Show All 13 Lines

	/* LayerCollection->flag */			/* LayerCollection->flag */
	enum {			enum {
	COLLECTION_VISIBLE = (1 << 0),			COLLECTION_VISIBLE = (1 << 0),
	COLLECTION_SELECTABLE = (1 << 1),			COLLECTION_SELECTABLE = (1 << 1),
	COLLECTION_DISABLED = (1 << 2),			COLLECTION_DISABLED = (1 << 2),
	};			};

	/* SceneLayer->flag */			/* ViewLayer->flag */
	enum {			enum {
	SCENE_LAYER_RENDER = (1 << 0),			VIEW_LAYER_RENDER = (1 << 0),
	SCENE_LAYER_ENGINE_DIRTY = (1 << 1),			VIEW_LAYER_ENGINE_DIRTY = (1 << 1),
	SCENE_LAYER_FREESTYLE = (1 << 2),			VIEW_LAYER_FREESTYLE = (1 << 2),
	};			};


	/* *************************************************************** */			/* *************************************************************** */
	/* Engine Settings */			/* Engine Settings */

	/* CollectionEngineSettings->type */			/* CollectionEngineSettings->type */
	typedef enum CollectionEngineSettingsType {			typedef enum CollectionEngineSettingsType {
	Show All 16 Lines