[Bf-blender-cvs] [0728c897d78] master: Fix T56704: black / NaN values in Cycles normal pass.

Brecht Van Lommel noreply at git.blender.org
Thu Sep 6 20:13:44 CEST 2018


Commit: 0728c897d785c86e735a766e78c8681df3ab1b25
Author: Brecht Van Lommel
Date:   Thu Sep 6 20:06:23 2018 +0200
Branches: master
https://developer.blender.org/rB0728c897d785c86e735a766e78c8681df3ab1b25

Fix T56704: black / NaN values in Cycles normal pass.

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

M	intern/cycles/kernel/kernel_montecarlo.h

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

diff --git a/intern/cycles/kernel/kernel_montecarlo.h b/intern/cycles/kernel/kernel_montecarlo.h
index 09a3fe8f23d..9b96bb80c32 100644
--- a/intern/cycles/kernel/kernel_montecarlo.h
+++ b/intern/cycles/kernel/kernel_montecarlo.h
@@ -202,12 +202,12 @@ ccl_device float3 ensure_valid_reflection(float3 Ng, float3 I, float3 N)
 	float Ix2 = sqr(dot(I, X)), Iz2 = sqr(Iz);
 	float Ix2Iz2 = Ix2 + Iz2;
 
-	float a = sqrtf(Ix2*(Ix2Iz2 - sqr(0.05f)));
+	float a = safe_sqrtf(Ix2*(Ix2Iz2 - sqr(0.05f)));
 	float b = Iz*0.05f + Ix2Iz2;
 	float c = (a + b > 0.0f)? (a + b) : (-a + b);
 
-	float Nz = sqrtf(0.5f * c * (1.0f / Ix2Iz2));
-	float Nx = sqrtf(1.0f - sqr(Nz));
+	float Nz = safe_sqrtf(0.5f * c * (1.0f / Ix2Iz2));
+	float Nx = safe_sqrtf(1.0f - sqr(Nz));
 
 	/* Transform back into global coordinates. */
 	return Nx*X + Nz*Ng;



More information about the Bf-blender-cvs mailing list