diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-06 13:25:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-06 13:25:33 +0300 |
| commit | ea606a7847a316a82b365155f666b33e81ff4c2e (patch) | |
| tree | d58158c83fd66000fbe9db0c45fa39b6fc02076e /source/blender/editors/sculpt_paint/paint_vertex_color_utils.c | |
| parent | d7d32ad45217736c677edd22906d980d03aeb175 (diff) | |
| parent | 3df139c53062a141403ea9d359715ca3635c243c (diff) | |
Merge branch 'master' into blender28
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex_color_utils.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex_color_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c index 3b3e7297aec..a8045232e05 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c @@ -298,7 +298,7 @@ BLI_INLINE uint mcol_colordodge(uint col1, uint col2, int fac) cp[0] = (mfac * cp1[0] + temp * fac) / 255; temp = (cp2[1] == 255) ? 255 : min_ii((cp1[1] * 225) / (255 - cp2[1]), 255); cp[1] = (mfac * cp1[1] + temp * fac) / 255; - temp = (cp2[2] == 255) ? 255 : min_ii((cp1[2] * 225 )/ (255 - cp2[2]), 255); + temp = (cp2[2] == 255) ? 255 : min_ii((cp1[2] * 225) / (255 - cp2[2]), 255); cp[2] = (mfac * cp1[2] + temp * fac) / 255; temp = (cp2[3] == 255) ? 255 : min_ii((cp1[3] * 225) / (255 - cp2[3]), 255); cp[3] = (mfac * cp1[3] + temp * fac) / 255; |