diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-01 18:54:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-01 19:04:37 +0300 |
commit | 8ce14aa21f45653ab33bdd9e6e20cea3f09fa873 (patch) | |
tree | a8b9db961550a5d4ff8c1f9e3a94d9e32d4b297c /source/blender/editors/sculpt_paint/paint_image_2d.c | |
parent | 7aff48add08a875138d3a65c16811c8cb0e5eae1 (diff) |
Cleanup: rename image undo_tile to paint_tile
Clearer because they're no longer the same as undo tiles.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_2d.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_2d.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 8f1156295a3..58ea00d6740 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -1197,23 +1197,24 @@ static void paint_2d_do_making_brush(ImagePaintState *s, int tileh) { ImBuf tmpbuf; - IMB_initImBuf(&tmpbuf, IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE, 32, 0); + IMB_initImBuf(&tmpbuf, ED_IMAGE_UNDO_TILE_SIZE, ED_IMAGE_UNDO_TILE_SIZE, 32, 0); - ListBase *undo_tiles = ED_image_undo_get_tiles(); + ListBase *undo_tiles = ED_image_paint_tile_list_get(); for (int ty = tiley; ty <= tileh; ty++) { for (int tx = tilex; tx <= tilew; tx++) { /* retrieve original pixels + mask from undo buffer */ unsigned short *mask; - int origx = region->destx - tx * IMAPAINT_TILE_SIZE; - int origy = region->desty - ty * IMAPAINT_TILE_SIZE; + int origx = region->destx - tx * ED_IMAGE_UNDO_TILE_SIZE; + int origy = region->desty - ty * ED_IMAGE_UNDO_TILE_SIZE; if (s->canvas->rect_float) { - tmpbuf.rect_float = image_undo_find_tile( + tmpbuf.rect_float = ED_image_paint_tile_find( undo_tiles, s->image, s->canvas, tx, ty, &mask, false); } else { - tmpbuf.rect = image_undo_find_tile(undo_tiles, s->image, s->canvas, tx, ty, &mask, false); + tmpbuf.rect = ED_image_paint_tile_find( + undo_tiles, s->image, s->canvas, tx, ty, &mask, false); } IMB_rectblend(s->canvas, @@ -1455,7 +1456,7 @@ static void paint_2d_canvas_free(ImagePaintState *s) MEM_freeN(s->blurkernel); } - image_undo_remove_masks(); + ED_image_paint_tile_remove_masks_all(); } void paint_2d_stroke(void *ps, |