diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-28 17:05:21 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-28 17:05:21 +0400 |
commit | 54b197695859f351f2116c40354f92a24baeb4e6 (patch) | |
tree | eca94040cb464c4d7c8699f60d443b345a9b7abe /intern/cycles/kernel/osl/osl_services.h | |
parent | 0d7dbbb6e1fc0bb85d236ca1e04ff966f4ad39c9 (diff) |
Fix #35896: cycles crash with OSL image textures and viewport + preview render
running at the same time.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.h')
-rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 5043852846d..ca18c85a167 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -45,7 +45,7 @@ public: OSLRenderServices(); ~OSLRenderServices(); - void thread_init(KernelGlobals *kernel_globals); + void thread_init(KernelGlobals *kernel_globals, OSL::TextureSystem *ts); bool get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time); bool get_inverse_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time); @@ -148,6 +148,7 @@ public: private: KernelGlobals *kernel_globals; + OSL::TextureSystem *osl_ts; }; CCL_NAMESPACE_END |