Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-09 23:03:01 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-09 23:15:59 +0300
commit5dc9797f0b9f435126ca8bf0a16bbe1e11a1d0a2 (patch)
treed2340a8049132ad516a960762d9ac17b46ba18b4 /source/blender/gpu/intern/gpu_draw.c
parent6797e80f2e69630bbd07ccb5f2cfdb97bac6332b (diff)
Fix T65657: crash in float texture painting, after recent changes
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
-rw-r--r--source/blender/gpu/intern/gpu_draw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index d3d7b3b7c1d..7813ae68371 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -400,7 +400,7 @@ static void gpu_texture_update_from_ibuf(Image *ima, ImBuf *ibuf, int x, int y,
const bool store_premultiplied = (ima->alpha_mode != IMA_ALPHA_STRAIGHT);
if (ibuf->channels != 4 || scaled || !store_premultiplied) {
- rect_float = MEM_mallocN(sizeof(float) * 4 * x * y, __func__);
+ rect_float = MEM_mallocN(sizeof(float) * 4 * w * h, __func__);
if (rect_float == NULL) {
return;
}