Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-03-27 13:47:55 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-03-27 16:23:31 +0300
commit585dd261208e7b92035f32909399330cadaa36d5 (patch)
tree36cc1239806bb2c6bb2ade50e734a3df64ddc987 /intern/cycles/render/shader.cpp
parent232c2d382e4218f89f5c689e1982626b20fd54d2 (diff)
Cycles: Code cleanup, prepare for strict C++ flags
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 5899c562f72..81a7b787885 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -321,7 +321,10 @@ void ShaderManager::device_update_shaders_used(Scene *scene)
scene->shaders[light->shader]->used = true;
}
-void ShaderManager::device_update_common(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
+void ShaderManager::device_update_common(Device *device,
+ DeviceScene *dscene,
+ Scene *scene,
+ Progress& /*progress*/)
{
device->tex_free(dscene->shader_flag);
dscene->shader_flag.clear();