diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-03-18 14:03:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-03-18 14:03:22 +0300 |
| commit | 4070bb242df92f753ed59f94799420e077e7270c (patch) | |
| tree | b276b567e3a4e9eb9738a3213ae987aa14660557 /intern/cycles/render/light.cpp | |
| parent | 6d99b2c021847c1015a3945530d4d32049e0d659 (diff) | |
| parent | 7c5be750a3c825e63194f79a26ab82dd805611d0 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/light.cpp')
| -rw-r--r-- | intern/cycles/render/light.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 755b941717e..ac41fce96d7 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -192,7 +192,7 @@ bool LightManager::has_background_light(Scene *scene) return false; } -void LightManager::disable_ineffective_light(Device *device, Scene *scene) +void LightManager::disable_ineffective_light(Device * /*device*/, Scene *scene) { /* Make all lights enabled by default, and perform some preliminary checks * needed for finer-tuning of settings (for example, check whether we've |