diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-28 19:37:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-28 19:37:18 +0400 |
| commit | 608dc78241c98341c8fb4cab12d73f148adf0471 (patch) | |
| tree | 6b8897d8a1859565e6ed5e19ad40916c29ecddc9 /source/blender/editors/sculpt_paint | |
| parent | 428debd9c8af81ed5870c70466d46a60646f49e3 (diff) | |
warning cleanup: assignment to unused vars, r56359 changes how brush falloff is used slightly but this isn't so important so just remove falloff adjustment.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 8efb765058d..b4507ecb6cc 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3822,7 +3822,7 @@ static void *do_projectpaint_thread(void *ph_v) float mask = ((float)projPixel->mask) * (1.0f / 65535.0f); straight_uchar_to_premul_float(newColor_f, projPixel->newColor.ch); - mul_v4_v4fl(newColor_f, newColor_f, mask); + mul_v4_v4fl(newColor_f, newColor_f, mask); blend_color_mix_float(projPixel->pixel.f_pt, projPixel->origColor.f, newColor_f); @@ -3893,10 +3893,6 @@ static void *do_projectpaint_thread(void *ph_v) mask *= ((float)projPixel->mask) * (1.0f / 65535.0f); } else { - /* This brush dosnt accumulate so add some curve to the brushes falloff */ - falloff = 1.0f - falloff; - falloff = 1.0f - (falloff * falloff); - mask_short = (unsigned short)(projPixel->mask * mask); if (mask_short > projPixel->mask_max) { |