diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
| commit | e76ff4df4123b5517599930629dbcf0507b582e9 (patch) | |
| tree | 3cf9a67f3a3a05c678f39a04533da81f56e66c02 /source/blender/editors/space_image/image_undo.c | |
| parent | 15dd6cb66887eb83fcc3ecf44c3b42a53161e390 (diff) | |
| parent | 528f0b95c4462b2e429600a566ca0434c90310f6 (diff) | |
Merge branch 'master' into tmp-widget-optitmp-widget-opti
# Conflicts:
# source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
Diffstat (limited to 'source/blender/editors/space_image/image_undo.c')
| -rw-r--r-- | source/blender/editors/space_image/image_undo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_undo.c b/source/blender/editors/space_image/image_undo.c index eb1c46240cb..5668b88826e 100644 --- a/source/blender/editors/space_image/image_undo.c +++ b/source/blender/editors/space_image/image_undo.c @@ -225,9 +225,9 @@ void *ED_image_paint_tile_push(ListBase *paint_tiles, "PaintTile.mask"); } - ptile->rect.pt = MEM_mapallocN((ibuf->rect_float ? sizeof(float[4]) : sizeof(char[4])) * - square_i(ED_IMAGE_UNDO_TILE_SIZE), - "PaintTile.rect"); + ptile->rect.pt = MEM_callocN((ibuf->rect_float ? sizeof(float[4]) : sizeof(char[4])) * + square_i(ED_IMAGE_UNDO_TILE_SIZE), + "PaintTile.rect"); ptile->use_float = has_float; ptile->valid = true; |