Commit: ef8ad66aa2d25f414822871f61ece54b0d5a6931
Author: Sergey Sharybin
Date: Mon May 15 15:44:09 2017 +0200
Branches: master
https://developer.blender.org/rBef8ad66aa2d25f414822871f61ece54b0d5a6931
Fix T49324: True displacement crashes when shader returns NaN
===================================================================
M intern/cycles/render/mesh_displace.cpp
===================================================================
diff --git a/intern/cycles/render/mesh_displace.cpp
b/intern/cycles/render/mesh_displace.cpp
index cf28bb16bb7..4ca20cf7ef3 100644
--- 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++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
