From 99088f8b552ccbdff5834a060a2a2e032e25f0b5 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sat, 25 Jun 2016 11:14:06 +0200 Subject: Fix T48732, OpenCL compile failure after Multiscatter GGX commit. Use OpenCL "all" builtin type for conversion, according to OpenCL 1.1 spec 6.3e. --- intern/cycles/kernel/closure/bsdf_microfacet_multi.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/cycles') diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h index 21fbfa9b025..b6c24946587 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h @@ -348,7 +348,11 @@ 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 sc->T = make_float3(1.0f, 0.0f, 0.0f); return bsdf_microfacet_multi_ggx_common_setup(sc); -- cgit v1.2.3