kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix mistake in Cycles mix node multiply constant folding.

Browse Source
This commit is contained in:
Brecht Van Lommel 2016-07-31 14:56:49 +02:00
parent 81f4bc1665
commit feac208557
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/constant_fold.cpp
View File

@ -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;