From 0728c897d785c86e735a766e78c8681df3ab1b25 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 6 Sep 2018 20:06:23 +0200 Subject: Fix T56704: black / NaN values in Cycles normal pass. --- intern/cycles/kernel/kernel_montecarlo.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern') 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; -- cgit v1.2.3 From a5bb40170417acede168291eb81e3076a6cee077 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 6 Sep 2018 20:09:13 +0200 Subject: Cleanup: fix compiler warning. --- intern/cycles/render/camera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index cc3dd1c923b..ec3c56e820a 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -716,7 +716,7 @@ float Camera::world_to_raster_size(float3 P) float3 D = transform_point(&worldtocamera, P); float dist = len(D); - Ray ray; + Ray ray = {0}; /* Distortion can become so great that the results become meaningless, there * may be a better way to do this, but calculating differentials from the -- cgit v1.2.3