Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T49252: Crash when image textures used with true displacement

Browse Source
This commit is contained in:
Mai Lavelle
2016-09-05 12:51:30 -04:00
parent 718bf8fd9d
commit 56d2f4c20a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/mesh.cpp
View File

@@ -1650,10 +1650,10 @@ void MeshManager::device_update_displacement_images(Device *device,
foreach(Mesh *mesh, scene->meshes) { foreach(Mesh *mesh, scene->meshes) {
if(mesh->need_update) { if(mesh->need_update) {
foreach(Shader *shader, mesh->used_shaders) { foreach(Shader *shader, mesh->used_shaders) {
if(shader->graph_bump == NULL) { if(!shader->has_displacement || shader->displacement_method == DISPLACE_BUMP) {
continue; continue;
} }
foreach(ShaderNode* node, shader->graph_bump->nodes) { foreach(ShaderNode* node, shader->graph->nodes) {
if(node->special_type != SHADER_SPECIAL_TYPE_IMAGE_SLOT) { if(node->special_type != SHADER_SPECIAL_TYPE_IMAGE_SLOT) {
continue; continue;
} }