diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-03 21:00:53 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-03 21:00:53 +0400 |
| commit | 0dabf824fbcb7d343919edd88e29bd267a8734f6 (patch) | |
| tree | e1f43464955962754aebca302ed6c940c698713a /source/blender/blenkernel/intern/image.c | |
| parent | 56a531eb29bb9ec2e4687645bd22f832054e635f (diff) | |
Fix T38045: Clone stamp crashes
Issue seems to be caused by thread-unsafe IMB_freeImBuf.
Now use generic BKE_image_release_ibuf to de-reference
image buffer which was acquired from image datablock.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 288443db650..f83112ba283 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3611,7 +3611,9 @@ bool BKE_image_has_loaded_ibuf(Image *image) return has_loaded_ibuf; } -/* References the result, IMB_freeImBuf is to be called to de-reference. */ +/* References the result, BKE_image_release_ibuf is to be called to de-reference. + * Use lock=NULL when calling BKE_image_release_ibuf(). + */ ImBuf *BKE_image_get_ibuf_with_name(Image *image, const char *name) { ImBuf *ibuf = NULL; @@ -3635,7 +3637,8 @@ ImBuf *BKE_image_get_ibuf_with_name(Image *image, const char *name) return ibuf; } -/* References the result, IMB_freeImBuf is to be called to de-reference. +/* References the result, BKE_image_release_ibuf is to be called to de-reference. + * Use lock=NULL when calling BKE_image_release_ibuf(). * * TODO(sergey): This is actually "get first entry from the cache", which is * not so much predictable. But using first loaded image buffer |