diff options
| author | Pascal Schoen <pascal_schoen@gmx.net> | 2016-10-20 11:41:50 +0300 |
|---|---|---|
| committer | Pascal Schoen <pascal_schoen@gmx.net> | 2016-10-20 11:41:50 +0300 |
| commit | 4dfcf455f7769752044e051b399fb6a5dfcd0e22 (patch) | |
| tree | 09ef0f679da559461cf80b3a577b506e291d7eb6 /intern/cycles/kernel/closure/bsdf_microfacet.h | |
| parent | 243a0e3eb80ef82704d5ea2657384c3a4b9fb497 (diff) | |
| parent | 2cd6a89d07e031901291ab95b9a5d6cdeb372bbe (diff) | |
Merge branch 'master' into cycles_disney_brdf
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf_microfacet.h')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf_microfacet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h index 6c2f2958af9..744830bdb4f 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet.h @@ -184,7 +184,7 @@ ccl_device_inline void microfacet_ggx_sample_slopes( *slope_y = S * z * safe_sqrtf(1.0f + (*slope_x)*(*slope_x)); } -ccl_device_inline float3 microfacet_sample_stretched( +ccl_device_forceinline float3 microfacet_sample_stretched( KernelGlobals *kg, const float3 omega_i, const float alpha_x, const float alpha_y, const float randu, const float randv, @@ -277,7 +277,7 @@ ccl_device bool bsdf_microfacet_merge(const ShaderClosure *a, const ShaderClosur (isequal_float3(bsdf_a->T, bsdf_b->T)) && (bsdf_a->ior == bsdf_b->ior) && ((!bsdf_a->extra && !bsdf_b->extra) || - ((bsdf_a->extra && bsdf_b->extra) && + ((bsdf_a->extra && bsdf_b->extra) && (isequal_float3(bsdf_a->extra->color, bsdf_b->extra->color)))); } |