From 3abe8b3292cf7a50a9200b95401993384df24d9a Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 22 Nov 2017 10:52:39 -0200 Subject: 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 --- source/blender/draw/engines/eevee/eevee_data.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/draw/engines/eevee/eevee_data.c') 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; -- cgit v1.2.3