diff options
| author | Pascal Schoen <pascal_schoen@gmx.net> | 2016-09-06 16:59:05 +0300 |
|---|---|---|
| committer | Pascal Schoen <pascal_schoen@gmx.net> | 2016-09-06 16:59:05 +0300 |
| commit | cdd29d06bb86672ed0779eefb8eee95796b8f939 (patch) | |
| tree | bcc0d875b00fe016144df73161f6398cec900577 /intern/cycles/render | |
| parent | 02c315aeb0f0d7bb429d4396912e03dbb8a77340 (diff) | |
| parent | b40d1c1903207f1c5ba1b7cb3050b4a836c2171d (diff) | |
Merge branch 'master' into cycles_disney_brdf
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 5445fd3c29c..2d297c33446 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -1650,10 +1650,10 @@ void MeshManager::device_update_displacement_images(Device *device, foreach(Mesh *mesh, scene->meshes) { if(mesh->need_update) { foreach(Shader *shader, mesh->used_shaders) { - if(shader->graph_bump == NULL) { + if(!shader->has_displacement || shader->displacement_method == DISPLACE_BUMP) { continue; } - foreach(ShaderNode* node, shader->graph_bump->nodes) { + foreach(ShaderNode* node, shader->graph->nodes) { if(node->special_type != SHADER_SPECIAL_TYPE_IMAGE_SLOT) { continue; } diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index c916e4a5f5e..dd733f73306 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -798,6 +798,7 @@ class CameraNode : public ShaderNode { public: SHADER_NODE_CLASS(CameraNode) bool has_spatial_varying() { return true; } + virtual int get_group() { return NODE_GROUP_LEVEL_2; } }; class FresnelNode : public ShaderNode { |