[Bf-blender-cvs] [0ec87f1] master: Cycles: Cleanup, indentation
Sergey Sharybin
noreply at git.blender.org
Wed Sep 28 17:05:49 CEST 2016
Commit: 0ec87f122721b13c747279703b963242bbc23998
Author: Sergey Sharybin
Date: Wed Sep 28 17:05:33 2016 +0200
Branches: master
https://developer.blender.org/rB0ec87f122721b13c747279703b963242bbc23998
Cycles: Cleanup, indentation
===================================================================
M intern/cycles/kernel/closure/bsdf_microfacet.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index 9da73f6..7c36f05 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))));
}
More information about the Bf-blender-cvs
mailing list