Commit: feac208557110f3f3db8c7763844d01e29077a50
Author: Brecht Van Lommel
Date: Sun Jul 31 14:56:49 2016 +0200
Branches: master
https://developer.blender.org/rBfeac208557110f3f3db8c7763844d01e29077a50
Fix mistake in Cycles mix node multiply constant folding.
===================================================================
M intern/cycles/render/constant_fold.cpp
===================================================================
diff --git a/intern/cycles/render/constant_fold.cpp
b/intern/cycles/render/constant_fold.cpp
index 473560b..073bafc 100644
--- a/intern/cycles/render/constant_fold.cpp
+++ b/intern/cycles/render/constant_fold.cpp
@@ -247,10 +247,10 @@ void ConstantFolder::fold_mix(NodeMix type, bool clamp)
const
try_bypass_or_make_constant(color1_in, clamp);
}
/* 0 * ? (fac ?) == 0, ? * 0 (fac 1) == 0 */
- else if(is_zero(color1_in) && fac_is_one) {
+ else if(is_zero(color1_in)) {
make_zero();
}
- else if(is_zero(color2_in)) {
+ else if(is_zero(color2_in) && fac_is_one) {
make_zero();
}
break;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
