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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-01 19:10:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-01 19:12:09 +0300
commitcd047de0267887e42cf13cb4643cbc270c060e70 (patch)
tree06add8d59d81dc28792e750b007c5bdbb34ac3ce /source/blender/editors/space_image/image_edit.c
parent25de685d3668b6ed10af144ff33e2d44da00df61 (diff)
Correction to previous fix of multiple releases of same ImBuf
Original change in d631252 was not quite correct because it was missing release since the acquire() will return NULL. Hopefully now all the cases are covered.
Diffstat (limited to 'source/blender/editors/space_image/image_edit.c')
-rw-r--r--source/blender/editors/space_image/image_edit.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index e48f4e24c34..ffbbcd6d722 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -119,6 +119,8 @@ ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **r_lock)
if (ibuf) {
if (ibuf->rect || ibuf->rect_float)
return ibuf;
+ BKE_image_release_ibuf(sima->image, ibuf, *r_lock);
+ *r_lock = NULL;
}
}
else