diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-22 16:50:05 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-09-04 13:55:47 +0300 |
| commit | 9997f5ca91cc70af8a8d8f91808ddf79236231db (patch) | |
| tree | 9fa03793966556ba4c1240c840d16b20063616c5 /source/blender/makesrna/intern/rna_image_api.c | |
| parent | 63e21e7218dcb4386cc224f3c3a8a5c4570ef712 (diff) | |
Fix threading conflict when doing Cycles background render
It is possible to have same image used multiple times at different frames,
which means we can not free it's buffers without any guard. From quick tests
this seems to be doing what it is supposed to.
Need more testing and port this to 2.79.
Diffstat (limited to 'source/blender/makesrna/intern/rna_image_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 344c1781b46..5c706d9d8db 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -291,7 +291,7 @@ static void rna_Image_filepath_from_user(Image *image, ImageUser *image_user, ch static void rna_Image_buffers_free(Image *image) { - BKE_image_free_buffers(image); + BKE_image_free_buffers_ex(image, true); } #else |