From 576e579925d205a44dd347fca3646f5c749a60a6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 30 Apr 2013 16:07:52 +0000 Subject: More painting fixes: * 2D image painting with textures that contained alpha did not work correctly, had been broken for a while. * 2D image panels texture (mask) panels showed wrong buttons for texture overlay. * Texture map mode 3D now also uses masking, like Tiled and Stencil the texture does not move along with the brush so it works fine. * 2D image paint View mapping did not work correct, especially noticeable with Rake rotation. * Masking is now disabled for the smear tool, this can't really work because the original image is constantly changing and gave artifacts. --- source/blender/blenkernel/BKE_brush.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/BKE_brush.h') diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 0ae243483dd..60c50b989fb 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -80,8 +80,10 @@ float BKE_brush_sample_tex_3D(const Scene *scene, struct Brush *br, const float float rgba[4], const int thread, struct ImagePool *pool); float BKE_brush_sample_masktex(const Scene *scene, struct Brush *br, const float point[3], const int thread, struct ImagePool *pool); -void BKE_brush_imbuf_new(const struct Scene *scene, struct Brush *brush, short flt, - short texfalloff, int size, struct ImBuf **imbuf, + +enum BrushImBufFill { BRUSH_IMBUF_MASK, BRUSH_IMBUF_TEX, BRUSH_IMBUF_TEX_MASK }; +void BKE_brush_imbuf_new(const struct Scene *scene, struct Brush *brush, bool use_float, + enum BrushImBufFill fill, int size, struct ImBuf **imbuf, bool use_color_correction, bool use_brush_alpha, struct ImagePool *pool, struct rctf *mapping); -- cgit v1.2.3