diff options
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |