[Bf-blender-cvs] [a2c82f5] master: Cycles: Fix OpenCL compilation after the recent numerical fixes

[Lukas Stockner]

Commit: a2c82f5e5dfe8ca31861c6e20757c1b614530599
Author: Lukas Stockner
Date:   Sun Jul 17 19:24:53 2016 +0200
Branches: master
https://developer.blender.org/rBa2c82f5e5dfe8ca31861c6e20757c1b614530599

Cycles: Fix OpenCL compilation after the recent numerical fixes

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

M	intern/cycles/kernel/closure/bsdf_microfacet_multi.h
M	intern/cycles/kernel/svm/svm_tex_coord.h

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

diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
index 6060d7d..51b12fe 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
@@ -348,11 +348,7 @@ ccl_device int bsdf_microfacet_multi_ggx_common_setup(ShaderClosure *sc)
 
 ccl_device int bsdf_microfacet_multi_ggx_aniso_setup(ShaderClosure *sc)
 {
-#ifdef __KERNEL_OPENCL__
-	if(all(sc->T == 0.0f))
-#else
-	if(sc->T == make_float3(0.0f, 0.0f, 0.0f))
-#endif
+	if(is_zero(sc->T))
 		sc->T = make_float3(1.0f, 0.0f, 0.0f);
 
 	return bsdf_microfacet_multi_ggx_common_setup(sc);
diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h
index 0bac836..276b6f2 100644
--- a/intern/cycles/kernel/svm/svm_tex_coord.h
+++ b/intern/cycles/kernel/svm/svm_tex_coord.h
@@ -340,7 +340,7 @@ ccl_device void svm_node_normal_map(KernelGlobals *kg, ShaderData *sd, float *st
 		N = safe_normalize(ccl_fetch(sd, N) + (N - ccl_fetch(sd, N))*strength);
 	}
 
-	if(N == make_float3(0.0f, 0.0f, 0.0f)) {
+	if(is_zero(N)) {
 		N = ccl_fetch(sd, N);
 	}