diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-28 18:05:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-28 18:05:33 +0300 |
| commit | 0ec87f122721b13c747279703b963242bbc23998 (patch) | |
| tree | 3632c92e744c13f34be0d942ccef5135a5745954 /intern/cycles/kernel/closure | |
| parent | e1bfb89da25e1e879d046144dfccb12e914c97c0 (diff) | |
Cycles: Cleanup, indentation
Diffstat (limited to 'intern/cycles/kernel/closure')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf_microfacet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h index 9da73f66da0..7c36f05b6cc 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet.h @@ -267,7 +267,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)))); } |