blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: Painting - reduce reallocation of same memory. 

Curve mask is freed/allocated every time, but could still reuse the
previous allocated buffer when the diameter of the brush doesn't change.
This commit is contained in:
Jeroen Bakker 2021-11-17 12:25:10 +01:00
parent f5dde382af
commit e5f05bc7a6
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/editors/sculpt_paint/paint_image_2d.c
View File

@ -381,18 +381,17 @@ static void brush_painter_mask_imbuf_partial_update(BrushPainter *painter,
}
/* create a mask with the falloff strength */
static ushort *brush_painter_curve_mask_new(BrushPainter *painter,
int diameter,
float radius,
const float pos[2])
static ushort *brush_painter_curve_mask_init(
ushort *mask, BrushPainter *painter, int diameter, float radius, const float pos[2])
{
BLI_assert_msg(MEM_allocN_len(mask) == diameter * diameter * sizeof(ushort),
"Allocated size of mask doesn't match.");
Brush *brush = painter->brush;
int offset = (int)floorf(diameter / 2.0f);
ushort *mask, *m;
mask = MEM_mallocN(sizeof(ushort) * diameter * diameter, "brush_painter_mask");
ushort *m;
m = mask;
int aa_samples = 1.0f / (radius * 0.20f);
@ -453,6 +452,20 @@ static ushort *brush_painter_curve_mask_new(BrushPainter *painter,
return mask;
}
static void brush_painter_curve_mask_refresh(
BrushPainter *painter, ImagePaintTile *tile, int diameter, float radius, const float pos[2])
{
BrushPainterCache *cache = &tile->cache;
if (diameter != cache->lastdiameter) {
if (cache->curve_mask != NULL) {
MEM_freeN(cache->curve_mask);
}
cache->curve_mask = MEM_mallocN(sizeof(ushort) * diameter * diameter, "brush_painter_mask");
}
brush_painter_curve_mask_init(cache->curve_mask, painter, diameter, radius, pos);
}
/* create imbuf with brush color */
static ImBuf *brush_painter_imbuf_new(
BrushPainter *painter, ImagePaintTile *tile, const int size, float pressure, float distance)
@ -858,10 +871,8 @@ static void brush_painter_2d_refresh_cache(ImagePaintState *s,
}
}
/* curve mask can only change if the size changes */
MEM_SAFE_FREE(cache->curve_mask);
cache->curve_mask = brush_painter_curve_mask_new(painter, diameter, size, pos);
/* Re-initialize the curve mask. Mask is always recreated due to the change of position. */
brush_painter_curve_mask_refresh(painter, tile, diameter, size, pos);
/* detect if we need to recreate image brush buffer */
if (diameter != cache->lastdiameter || (tex_rotation != cache->last_tex_rotation) || do_random ||