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/draw/engines/eevee/eevee_engine.c | |
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/draw/engines/eevee/eevee_engine.c')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_engine.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 72ebfe94f16..2378a3c8784 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -50,7 +50,7 @@ static void EEVEE_engine_init(void *ved) EEVEE_TextureList *txl = vedata->txl; EEVEE_FramebufferList *fbl = vedata->fbl; EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); if (!stl->g_data) { /* Alloc transient pointers */ @@ -85,7 +85,7 @@ static void EEVEE_engine_init(void *ved) static void EEVEE_cache_init(void *vedata) { EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); EEVEE_bloom_cache_init(sldata, vedata); EEVEE_depth_of_field_cache_init(sldata, vedata); @@ -103,7 +103,7 @@ static void EEVEE_cache_init(void *vedata) static void EEVEE_cache_populate(void *vedata, Object *ob) { - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); const DRWContextState *draw_ctx = DRW_context_state_get(); const bool is_active = (ob == draw_ctx->obact); @@ -153,7 +153,7 @@ static void EEVEE_cache_populate(void *vedata, Object *ob) static void EEVEE_cache_finish(void *vedata) { - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); EEVEE_materials_cache_finish(vedata); EEVEE_lights_cache_finish(sldata); @@ -165,7 +165,7 @@ static void EEVEE_draw_scene(void *vedata) EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; EEVEE_FramebufferList *fbl = ((EEVEE_Data *)vedata)->fbl; - EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get(); + EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_get(); /* Default framebuffer and texture */ DefaultTextureList *dtxl = DRW_viewport_texture_list_get(); @@ -312,7 +312,7 @@ static void EEVEE_layer_collection_settings_create(RenderEngine *UNUSED(engine), UNUSED_VARS_NDEBUG(props); } -static void EEVEE_scene_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) +static void EEVEE_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props) { BLI_assert(props && props->type == IDP_GROUP && @@ -400,7 +400,7 @@ RenderEngineType DRW_engine_viewport_eevee_type = { NULL, NULL, EEVEE_ENGINE, N_("Eevee"), RE_INTERNAL | RE_USE_SHADING_NODES, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &EEVEE_layer_collection_settings_create, &EEVEE_scene_layer_settings_create, + &EEVEE_layer_collection_settings_create, &EEVEE_view_layer_settings_create, &draw_engine_eevee_type, {NULL, NULL, NULL} }; |