diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-06-25 12:14:06 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-06-25 12:14:06 +0300 |
| commit | 99088f8b552ccbdff5834a060a2a2e032e25f0b5 (patch) | |
| tree | 90def74cbe97e2a5a8f368769fa6389e85a63b2a /intern/cycles | |
| parent | 05a60aaa07e7c63399fe94f43793a801a88d1e71 (diff) | |
Fix T48732, OpenCL compile failure after Multiscatter GGX commit.
Use OpenCL "all" builtin type for conversion, according to OpenCL 1.1 spec 6.3e.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf_microfacet_multi.h | 4 |
1 files changed, 4 insertions, 0 deletions
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); |