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@gmail.com>2019-05-02 16:39:23 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-03 16:36:20 +0300
commit08a44d29815f6b0b9b675a503829d2e2ce7f6426 (patch)
tree42c195e502875ef46a277fecef17e450e06e3d8b /intern/cycles/kernel/osl/osl_services.h
parent45ad6cd5a785733612e0b355df7426154f262308 (diff)
Cleanup: refactor passing of OSL kernel globals for upcoming changes
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.h')
-rw-r--r--intern/cycles/kernel/osl/osl_services.h3
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 2fad5833fc9..e881e528fc5 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -45,7 +45,7 @@ class OSLRenderServices : public OSL::RendererServices {
OSLRenderServices();
~OSLRenderServices();
- void thread_init(KernelGlobals *kernel_globals, OSL::TextureSystem *ts);
+ void thread_init(KernelGlobals *kernel_globals, OSLGlobals *osl_globals, OSL::TextureSystem *ts);
bool get_matrix(OSL::ShaderGlobals *sg,
OSL::Matrix44 &result,
@@ -257,6 +257,7 @@ class OSLRenderServices : public OSL::RendererServices {
private:
KernelGlobals *kernel_globals;
+ OSLGlobals *osl_globals;
OSL::TextureSystem *osl_ts;
#ifdef WITH_PTEX
PtexCache *ptex_cache;