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:
authorBrecht Van Lommel <brecht@blender.org>2020-04-08 22:57:40 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-04-08 23:01:04 +0300
commitc13aa95eda888c61514693c33ec506bf182257a1 (patch)
tree565a687aa02e46ab44f035fffa5f689505656c2d /intern/cycles/render/image.h
parentcc53c9e4764fd938af3a486feb013026c134080f (diff)
Fix T75288: crash in Cycles image loading with multithreaded shader compilation
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r--intern/cycles/render/image.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 00ab12afd7a..2000582ce70 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -206,6 +206,7 @@ class ImageManager {
bool has_half_images;
thread_mutex device_mutex;
+ thread_mutex images_mutex;
int animation_frame;
vector<Image *> images;