diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-05 03:48:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-05 03:48:07 +0400 |
| commit | c77f46d2dd28b2d450f29a51df133dfa7aff35d9 (patch) | |
| tree | dc7f033e1509a25c9de6b39e6e79e1696d0013f6 /intern/cycles/render/osl.h | |
| parent | 0874237358aa6a80b7b56df1ca482a2db17a5d0d (diff) | |
Fix #34601: cycles OSL crash when using preview render and viewport render at
the same time, due to shared texture cache system.
Diffstat (limited to 'intern/cycles/render/osl.h')
| -rw-r--r-- | intern/cycles/render/osl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h index 2d3996df0eb..c459f6bfa08 100644 --- a/intern/cycles/render/osl.h +++ b/intern/cycles/render/osl.h @@ -21,6 +21,7 @@ #include "util_set.h" #include "util_string.h" +#include "util_thread.h" #include "shader.h" @@ -92,6 +93,10 @@ protected: OSLRenderServices *services; OSL::ErrorHandler errhandler; map<string, OSLShaderInfo> loaded_shaders; + + static OSL::TextureSystem *ts_shared; + static thread_mutex ts_shared_mutex; + static int ts_shared_users; }; #endif |