diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-02-14 19:44:09 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-02-14 19:44:09 +0400 |
| commit | 59a2ed19df86bcb60034af693ee8909ddc57c081 (patch) | |
| tree | 0fa55419f16bf949a723e4c596fa0049c3f94f3d /source/blender/blenkernel/intern/brush.c | |
| parent | 8d339a89dbdd6fb1691efd67544c79ffb6f6a2f8 (diff) | |
Fix: Tiled image painting in image editor was broken for float canvas.
The mask was initialized using texture values, while it needed to be
opaque.
Diffstat (limited to 'source/blender/blenkernel/intern/brush.c')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 2ce5053bdcc..ce838ce519e 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -588,11 +588,16 @@ void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texf else if (texfall == 1) { BKE_brush_sample_tex_2D(scene, brush, xy, dstf, 0); } - else { + else if (texfall == 2){ BKE_brush_sample_tex_2D(scene, brush, xy, rgba, 0); mul_v3_v3v3(dstf, rgba, brush_rgb); dstf[3] = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius); } + else { + BKE_brush_sample_tex_2D(scene, brush, xy, rgba, 0); + copy_v3_v3(dstf, brush_rgb); + dstf[3] = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius); + } } } } |