diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-11 15:56:13 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-07-11 15:56:13 +0300 |
| commit | 42fa889e46c2f63cf99482b603fbe8d2117ed2c7 (patch) | |
| tree | d5440b4cf2ea127e19acc047eb1832da1a4100de /source/blender/blenkernel | |
| parent | 117fd0247715bff6c265bb75f727112ce1fcb3cc (diff) | |
| parent | 08274433e1bd9db5a2a27e5d2f8862e9cc3f27f0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index bf27d6021b6..aedbd0673c2 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -4018,12 +4018,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 */ } |