diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-03 22:51:02 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-03 22:51:02 +0400 |
commit | f8c29c999f0f0a6ed7e8a8ba1de444fdc5bdd3f2 (patch) | |
tree | cb3f23b3d33b7a991f17020dde7c1d4eb26c2e58 /intern/cycles/render/osl.cpp | |
parent | 9b30e8d83ac1294bb7a0956d57f5d00d61df703f (diff) |
Fix for Cycles OSL: The RenderServices pointer in ShadingSystem is no longer accessible from the interface class (presumably because it is just the base class pointer anyway and would have to be casted). The OSLRenderServices pointer to our own implementation is now stored alongside the ShadingSystem in the kernel globals, so it can be accessed in thread_init.
Diffstat (limited to 'intern/cycles/render/osl.cpp')
-rw-r--r-- | intern/cycles/render/osl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 8bf32fdcb1a..d4c93c07e2f 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -101,6 +101,7 @@ void OSLShaderManager::device_update(Device *device, DeviceScene *dscene, Scene /* setup shader engine */ og->ss = ss; + og->services = services; int background_id = scene->shader_manager->get_shader_id(scene->default_background); og->background_state = og->surface_state[background_id & SHADER_MASK]; og->use = true; |