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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-05-14 15:50:03 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2016-06-08 22:45:40 +0300
commit64c9b93513b4f3e8a3c3ed19fe6fa8176334446a (patch)
tree70558c3cfbfde40e727c5a414d7660e668c83d2e /intern/cycles/render/mesh_displace.cpp
parent40453dbca1ee07dc1ecc4a8ad148b8c20e622270 (diff)
Code refactor: use shader pointers rather than shader indexes.
Diffstat (limited to 'intern/cycles/render/mesh_displace.cpp')
-rw-r--r--intern/cycles/render/mesh_displace.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp
index dccfd74f17a..df8be4cbe2f 100644
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -32,8 +32,8 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
bool has_displacement = false;
if(mesh->displacement_method != Mesh::DISPLACE_BUMP) {
- foreach(uint sindex, mesh->used_shaders)
- if(scene->shaders[sindex]->has_displacement)
+ foreach(Shader *shader, mesh->used_shaders)
+ if(shader->has_displacement)
has_displacement = true;
}