[Bf-blender-cvs] [0f1c395] master: Fix typo breaking compilation with rather strict flags (does not like implicit double to float conversion).

Bastien Montagne noreply at git.blender.org
Fri Oct 10 15:13:11 CEST 2014


Commit: 0f1c3958da3fb475feead1620ba9414b0d44aae0
Author: Bastien Montagne
Date:   Fri Oct 10 15:11:23 2014 +0200
Branches: master
https://developer.blender.org/rB0f1c3958da3fb475feead1620ba9414b0d44aae0

Fix typo breaking compilation with rather strict flags (does not like implicit double to float conversion).

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

M	intern/cycles/kernel/closure/bsdf_microfacet.h

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

diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index c48ebd0..8737b0e 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -85,7 +85,7 @@ ccl_device_inline float approx_erfinvf_do(float x)
 		const float c1 = -1.970840454f;
 		const float c2 = -1.624906493f;
 		const float c3 =  3.429567803f;
-		const float c4 =  1.641345311;
+		const float c4 =  1.641345311f;
 		const float d1 =  3.543889200f;
 		const float d2 =  1.637067800f;
 		const float z = sqrtf(-logf((1.0f - x) * 0.5f));




More information about the Bf-blender-cvs mailing list