Cycles: Cleanup, indentation
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Sep 2016 15:05:33 +0000 (17:05 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Sep 2016 15:05:33 +0000 (17:05 +0200)
intern/cycles/kernel/closure/bsdf_microfacet.h

index 9da73f66da0b74f908441535a78cc3277e6f386d..7c36f05b6cc09a12bb575661ec376e105cff427d 100644 (file)
@@ -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))));
 }