diff options
| author | Luca Rood <dev@lucarood.com> | 2017-04-21 15:28:23 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-04-24 17:09:04 +0300 |
| commit | 913e9350a56dc384d76a4b1cce36300764c35011 (patch) | |
| tree | d9639d9f1334314f2f50e3a3747f841a06a3b093 /source/blender/gpu/intern/gpu_draw.c | |
| parent | 2010dbe8a59e80775219fb5162f3c2f5dfd24e04 (diff) | |
Convert BaseLegacy to Base (part)
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 01759338744..55b3f170962 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -2179,7 +2179,7 @@ int GPU_default_lights(void) return count; } -int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[4][4], int ortho) +int GPU_scene_object_lights(SceneLayer *sl, float viewmat[4][4], int ortho) { /* disable all lights */ for (int count = 0; count < 8; count++) @@ -2191,13 +2191,10 @@ int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[4][ int count = 0; - for (BaseLegacy *base = scene->base.first; base; base = base->next) { + for (Base *base = FIRSTBASE_NEW; base; base = base->next) { if (base->object->type != OB_LAMP) continue; - if (!(base->lay & lay) || !(base->lay & ob->lay)) - continue; - Lamp *la = base->object->data; /* setup lamp transform */ |