Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Mar 2019 11:03:22 +0000 (12:03 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Mar 2019 11:03:22 +0000 (12:03 +0100)
intern/cycles/render/light.cpp

index 755b941717e6e83c3a66987c1cd9d4448237e05b..ac41fce96d77edaf648ed838757fd9fce8f1bd8f 100644 (file)
@@ -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