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 <brechtvanlommel@pandora.be>2012-11-09 07:10:22 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-09 07:10:22 +0400
commitf171d0f29c1394795c0a1dea2cb5118859e9ccdc (patch)
tree7836b2214cafec9a04effc7de8560eda74bcc9db /intern/cycles/render/osl.h
parent1c3640997c225d9bcd6e7559863d69366edc16ee (diff)
Fix #33125: cycles OSL crash with multiple render sessions running at the same time.
Diffstat (limited to 'intern/cycles/render/osl.h')
-rw-r--r--intern/cycles/render/osl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index cee37c58d74..b4b3f59e02a 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -73,6 +73,8 @@ protected:
OSLRenderServices *services;
OSL::ErrorHandler errhandler;
set<string> loaded_shaders;
+
+ bool thread_data_initialized;
};
#endif