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/gpu | |
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/gpu')
-rw-r--r-- | source/blender/gpu/GPU_draw.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index 53826876738..8d29632fc71 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -41,7 +41,7 @@ struct Image; struct ImageUser; struct Object; struct Scene; -struct SceneLayer; +struct ViewLayer; struct View3D; struct RegionView3D; struct SmokeModifierData; @@ -74,7 +74,7 @@ void GPU_disable_program_point_size(void); * - after drawing, the material must be disabled again */ void GPU_begin_object_materials(struct View3D *v3d, struct RegionView3D *rv3d, - struct Scene *scene, struct SceneLayer *scene_layer, + struct Scene *scene, struct ViewLayer *view_layer, struct Object *ob, bool glsl, bool *do_alpha_after); void GPU_end_object_materials(void); bool GPU_object_materials_check(void); @@ -98,7 +98,7 @@ int GPU_get_material_alpha_blend(void); int GPU_default_lights(void); int GPU_scene_object_lights( - struct SceneLayer *scene_layer, float viewmat[4][4], int ortho); + struct ViewLayer *view_layer, float viewmat[4][4], int ortho); /* Text render * - based on moving uv coordinates */ diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 4e2a492367a..f9cf3235ac1 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1553,7 +1553,7 @@ void GPU_end_dupli_object(void) } void GPU_begin_object_materials( - View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *scene_layer, Object *ob, + View3D *v3d, RegionView3D *rv3d, Scene *scene, ViewLayer *view_layer, Object *ob, bool glsl, bool *do_alpha_after) { Material *ma; @@ -1592,10 +1592,10 @@ void GPU_begin_object_materials( #ifdef WITH_GAMEENGINE if (rv3d->rflag & RV3D_IS_GAME_ENGINE) { - ob = BKE_object_lod_matob_get(ob, scene_layer); + ob = BKE_object_lod_matob_get(ob, view_layer); } #else - UNUSED_VARS(scene_layer); + UNUSED_VARS(view_layer); #endif /* initialize state */ @@ -2029,7 +2029,7 @@ int GPU_default_lights(void) return count; } -int GPU_scene_object_lights(SceneLayer *scene_layer, float viewmat[4][4], int ortho) +int GPU_scene_object_lights(ViewLayer *view_layer, float viewmat[4][4], int ortho) { /* disable all lights */ for (int count = 0; count < 8; count++) @@ -2041,7 +2041,7 @@ int GPU_scene_object_lights(SceneLayer *scene_layer, float viewmat[4][4], int or int count = 0; - for (Base *base = FIRSTBASE(scene_layer); base; base = base->next) { + for (Base *base = FIRSTBASE(view_layer); base; base = base->next) { if (base->object->type != OB_LAMP) continue; |