From 0ec87f122721b13c747279703b963242bbc23998 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 28 Sep 2016 17:05:33 +0200 Subject: Cycles: Cleanup, indentation --- intern/cycles/kernel/closure/bsdf_microfacet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/kernel/closure') 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)))); } -- cgit v1.2.3