diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-14 21:32:13 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
| commit | f15c63b0c2216fdebe559a0ed0f93765e6e763dc (patch) | |
| tree | 60426da70bb7973c90e1733683ea0c6f4c7cd9cc /source/blender/gpu | |
| parent | 9ce2370ce4f1e1e9bf14feaf56eee82bec9474ff (diff) | |
SceneRenderLayer > SceneLayer: Remove light_override
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_lamp.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_lamp.c | 4 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/gpu/GPU_lamp.h b/source/blender/gpu/GPU_lamp.h index f6fd817cc3f..87350f1ceb4 100644 --- a/source/blender/gpu/GPU_lamp.h +++ b/source/blender/gpu/GPU_lamp.h @@ -54,7 +54,7 @@ GPULamp *GPU_lamp_from_blender(struct Scene *scene, struct Object *ob, struct Ob void GPU_lamp_free(struct Object *ob); void GPU_lamp_engine_data_free(LampEngineData *led); -bool GPU_lamp_visible(GPULamp *lamp, struct SceneRenderLayer *srl, struct Material *ma); +bool GPU_lamp_visible(GPULamp *lamp, struct Material *ma); bool GPU_lamp_has_shadow_buffer(GPULamp *lamp); void GPU_lamp_update_buffer_mats(GPULamp *lamp); void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[4][4], int *winsize, float winmat[4][4]); diff --git a/source/blender/gpu/intern/gpu_lamp.c b/source/blender/gpu/intern/gpu_lamp.c index fbc1ace1292..3c49c057b49 100644 --- a/source/blender/gpu/intern/gpu_lamp.c +++ b/source/blender/gpu/intern/gpu_lamp.c @@ -52,12 +52,10 @@ #include "gpu_lamp_private.h" -bool GPU_lamp_visible(GPULamp *lamp, SceneRenderLayer *srl, Material *ma) +bool GPU_lamp_visible(GPULamp *lamp, Material *ma) { if (lamp->hide) return false; - else if (srl && srl->light_override) - return BKE_group_object_exists(srl->light_override, lamp->ob); else if (ma && ma->group) return BKE_group_object_exists(ma->group, lamp->ob); else diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index c30a28616e0..4668ea2998d 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -310,7 +310,7 @@ void GPU_material_bind( GPULamp *lamp = nlink->data; if ((lamp->lay & viewlay) && (!(lamp->mode & LA_LAYER) || (lamp->lay & oblay)) && - GPU_lamp_visible(lamp, srl, material->ma)) + GPU_lamp_visible(lamp, material->ma)) { lamp->dynenergy = lamp->energy; copy_v3_v3(lamp->dyncol, lamp->col); |