diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-02 08:39:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-02 08:39:29 +0300 |
commit | eae486f5e6c79b7b31e276dfaea69d2ece7fbf7f (patch) | |
tree | dd8220e52333289fa538925a95367ae47a793e3d /source/blender/blenlib/intern | |
parent | cb23927c9b24d5b17e35c8682060cd6839337a12 (diff) | |
parent | 0d8bf4bf947d84cdfc6e2b221ddb03c7f8d2114b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/math_color_blend_inline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/math_color_blend_inline.c b/source/blender/blenlib/intern/math_color_blend_inline.c index 048ab71c6dc..dc3874f83a2 100644 --- a/source/blender/blenlib/intern/math_color_blend_inline.c +++ b/source/blender/blenlib/intern/math_color_blend_inline.c @@ -444,7 +444,7 @@ MINLINE void blend_color_vividlight_byte(unsigned char dst[4], unsigned const ch else if (src2[i] == 0) { temp = 0; } - else if (src2[i] > 127) { + else if (src2[i] > 127) { temp = min_ii(((src1[i]) * 255) / (2 * (255 - src2[i])), 255); } else { |