diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-24 10:50:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-24 10:50:15 +0400 |
commit | dfdb2eb9a88b14c0aade5e7e503a160e521f7c63 (patch) | |
tree | 0e5926b9738c1c95c2d11b31dab0248645085f39 /source/blender/editors/sculpt_paint | |
parent | 8e6ce736c4fcdd83344b0b6e0ba65cec340eec21 (diff) |
fix own error in r56649, caused normal calculation to fail, reported as [#35448], also quiet float/double warning.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 604151b1e1e..d205b3ff4f9 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3844,7 +3844,7 @@ static void *do_projectpaint_thread(void *ph_v) if (ps->is_maskbrush) { float texmask = BKE_brush_sample_masktex(ps->scene, ps->brush, projPixel->projCoSS, thread_index, pool); - CLAMP(texmask, 0.0, 1.0); + CLAMP(texmask, 0.0f, 1.0f); mask = mask_accum + (brush_alpha * texmask * 65535.0f - mask_accum) * mask; } else { @@ -3865,7 +3865,7 @@ static void *do_projectpaint_thread(void *ph_v) mask *= brush_alpha; if (ps->is_maskbrush) { float texmask = BKE_brush_sample_masktex(ps->scene, ps->brush, projPixel->projCoSS, thread_index, pool); - CLAMP(texmask, 0.0, 1.0); + CLAMP(texmask, 0.0f, 1.0f); mask *= texmask; } } |