diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-07-31 15:56:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-07-31 16:00:40 +0300 |
| commit | feac208557110f3f3db8c7763844d01e29077a50 (patch) | |
| tree | 3ed53a2817e7ce63963894dd2c028f3e14a87b89 /intern/cycles/render/constant_fold.cpp | |
| parent | 81f4bc1665d92aa349cfc545e2cfe7c9a5febf5f (diff) | |
Fix mistake in Cycles mix node multiply constant folding.
Diffstat (limited to 'intern/cycles/render/constant_fold.cpp')
| -rw-r--r-- | intern/cycles/render/constant_fold.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/constant_fold.cpp b/intern/cycles/render/constant_fold.cpp index 473560b560d..073bafce98d 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; |