[Bf-blender-cvs] [cd047de] master: Correction to previous fix of multiple releases of same ImBuf

[Sergey Sharybin]

Commit: cd047de0267887e42cf13cb4643cbc270c060e70
Author: Sergey Sharybin
Date:   Mon Feb 1 17:10:40 2016 +0100
Branches: master
https://developer.blender.org/rBcd047de0267887e42cf13cb4643cbc270c060e70

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.

===================================================================

M	source/blender/editors/space_image/image_edit.c

===================================================================

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index e48f4e2..ffbbcd6 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