Merge branch 'master' into blender2.8

2 files changed, 4 insertions, 4 deletions

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;
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