Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-11-22 15:52:39 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-23 12:48:23 +0300
commit3abe8b3292cf7a50a9200b95401993384df24d9a (patch)
tree6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/draw/engines/eevee/eevee_data.c
parentfb7d23bdb2a5c0ed00067045e4acdf6593258b52 (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_data.c')
-rw-r--r--source/blender/draw/engines/eevee/eevee_data.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c
index 149a3740411..6b95844591d 100644
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@ -22,16 +22,16 @@
/** \file eevee_data.c
* \ingroup draw_engine
*
- * All specific data handler for Objects, Lights, SceneLayers, ...
+ * All specific data handler for Objects, Lights, ViewLayers, ...
*/
#include "DRW_render.h"
#include "eevee_private.h"
-static void eevee_scene_layer_data_free(void *storage)
+static void eevee_view_layer_data_free(void *storage)
{
- EEVEE_SceneLayerData *sldata = (EEVEE_SceneLayerData *)storage;
+ EEVEE_ViewLayerData *sldata = (EEVEE_ViewLayerData *)storage;
/* Lights */
MEM_SAFE_FREE(sldata->lamps);
@@ -78,13 +78,13 @@ static void eevee_lightprobe_data_free(void *storage)
BLI_freelistN(&ped->captured_object_list);
}
-EEVEE_SceneLayerData *EEVEE_scene_layer_data_get(void)
+EEVEE_ViewLayerData *EEVEE_view_layer_data_get(void)
{
- EEVEE_SceneLayerData **sldata = (EEVEE_SceneLayerData **)DRW_scene_layer_engine_data_get(
- &draw_engine_eevee_type, &eevee_scene_layer_data_free);
+ EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_get(
+ &draw_engine_eevee_type, &eevee_view_layer_data_free);
if (*sldata == NULL) {
- *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_SceneLayerData");
+ *sldata = MEM_callocN(sizeof(**sldata), "EEVEE_ViewLayerData");
}
return *sldata;