Fix T49324: True displacement crashes when shader returns NaN

2017-05-15 15:44:09 +02:00
parent 1f96dd2e0b
commit ef8ad66aa2
1 changed files with 2 additions and 0 deletions
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -169,6 +169,8 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
 			if(!done[t.v[j]]) {
 				done[t.v[j]] = true;
 				float3 off = float4_to_float3(offset[k++]);
+				/* Avoid illegal vertex coordinates. */
+				off = ensure_finite3(off);
 				mesh->verts[t.v[j]] += off;
 				if(attr_mP != NULL) {
 					for(int step = 0; step < mesh->motion_steps - 1; step++) {