diff options
| author | Severin <julian_eisel@web.de> | 2014-12-04 22:48:11 +0300 |
|---|---|---|
| committer | Severin <julian_eisel@web.de> | 2014-12-04 22:48:11 +0300 |
| commit | 1254e98a48aa92bbf6e707fbc28f42bee17a264f (patch) | |
| tree | 8cd67d04e91e3513bb55e5e93d7f78a30c77ddc4 /source/blender/blenkernel/intern/image.c | |
| parent | 151f2467a4c42d787d6d26869dbe402ccb725679 (diff) | |
| parent | 226eb53bc7f6d0aa1769b6c889d3b15d1f4944b5 (diff) | |
Merge branch 'master' into imeinput_method_editor
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 5c4ebea7d78..36cd7e69601 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -273,7 +273,13 @@ void BKE_image_free_buffers(Image *ima) ima->rr = NULL; } - GPU_free_image(ima); + if (!G.background) { + /* Background mode doesn't use opnegl, + * so we can avoid freeing GPU images and save some + * time by skipping mutex lock. + */ + GPU_free_image(ima); + } ima->ok = IMA_OK; } |