diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:52:39 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 12:48:23 +0300 |
commit | 3abe8b3292cf7a50a9200b95401993384df24d9a (patch) | |
tree | 6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/makesdna/DNA_layer_types.h | |
parent | fb7d23bdb2a5c0ed00067045e4acdf6593258b52 (diff) |
Rename any instance of scene layer or render layer in code with view layer
The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.
* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started
Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.
Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.
Reviewers: campbellbarton, sergey
Differential Revision: https://developer.blender.org/D2927
Diffstat (limited to 'source/blender/makesdna/DNA_layer_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_layer_types.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index d78a6af1d11..3eac7f0aab3 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -51,12 +51,12 @@ typedef struct CollectionOverride { /* TODO proper data */ } CollectionOverride; -typedef struct SceneLayerEngineData { - struct SceneLayerEngineData *next, *prev; +typedef struct ViewLayerEngineData { + struct ViewLayerEngineData *next, *prev; struct DrawEngineType *engine_type; void *storage; void (*free)(void *storage); -} SceneLayerEngineData; +} ViewLayerEngineData; typedef struct LayerCollection { struct LayerCollection *next, *prev; @@ -72,8 +72,8 @@ typedef struct LayerCollection { struct IDProperty *properties_evaluated; } LayerCollection; -typedef struct SceneLayer { - struct SceneLayer *next, *prev; +typedef struct ViewLayer { + struct ViewLayer *next, *prev; char name[64]; /* MAX_NAME */ short active_collection; short flag; @@ -96,8 +96,8 @@ typedef struct SceneLayer { struct FreestyleConfig freestyle_config; /* Runtime data */ - ListBase drawdata; /* SceneLayerEngineData */ -} SceneLayer; + ListBase drawdata; /* ViewLayerEngineData */ +} ViewLayer; typedef struct SceneCollection { struct SceneCollection *next, *prev; @@ -127,11 +127,11 @@ enum { COLLECTION_DISABLED = (1 << 2), }; -/* SceneLayer->flag */ +/* ViewLayer->flag */ enum { - SCENE_LAYER_RENDER = (1 << 0), - SCENE_LAYER_ENGINE_DIRTY = (1 << 1), - SCENE_LAYER_FREESTYLE = (1 << 2), + VIEW_LAYER_RENDER = (1 << 0), + VIEW_LAYER_ENGINE_DIRTY = (1 << 1), + VIEW_LAYER_FREESTYLE = (1 << 2), }; |