[Bf-blender-cvs] [989ca31] blender-v2.78-release: Fix T49252: Crash when image textures used with true displacement

[Mai Lavelle]

Commit: 989ca313be9eacc822f84853c3dbbe947164d5a2
Author: Mai Lavelle
Date:   Mon Sep 5 12:51:30 2016 -0400
Branches: blender-v2.78-release
https://developer.blender.org/rB989ca313be9eacc822f84853c3dbbe947164d5a2

Fix T49252: Crash when image textures used with true displacement

===================================================================

M	intern/cycles/render/mesh.cpp

===================================================================

diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 5445fd3..2d297c3 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;
 					}