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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-07-11 15:32:06 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-07-11 15:32:06 +0300
commit59b4c675361b54b32b6238855fe4a82117cc48c7 (patch)
tree4b36bd590a0a50ccd7206b03f611fe628a99d315 /source/blender
parent2b963ecb81d9854d4d3c3e761ee04d6d500c05c0 (diff)
Minor cleanup to logic in BKE's imbuf releasing code.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 76cf7317b19..c520714b076 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -4095,12 +4095,12 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **r_lock)
void BKE_image_release_ibuf(Image *ima, ImBuf *ibuf, void *lock)
{
- if (lock) {
+ if (lock != NULL) {
/* for getting image during threaded render / compositing, need to release */
if (lock == ima) {
BLI_thread_unlock(LOCK_VIEWER); /* viewer image */
}
- else if (lock) {
+ else {
RE_ReleaseResultImage(lock); /* render result */
BLI_thread_unlock(LOCK_VIEWER); /* view image imbuf */
}