diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-01 23:15:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-01 23:15:05 +0400 |
| commit | 7c0a0bae79bb8f842a575fe83975c6d34d73c64a (patch) | |
| tree | 844857e85903601f60a083d767d6317f3006d31f /intern/cycles/kernel/osl/osl_closures.cpp | |
| parent | 807fd448a557fbacb70fcd9b5cae76529fdb9b80 (diff) | |
Fix #33375: OSL geom:trianglevertices gave wrong coordinates for static BVH.
Also some simple OSL optimization, passing thread data pointer directly instead
of via thread local storage, and creating ustrings for attribute lookup.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_closures.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index d42d65608c8..f95859d237d 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -153,8 +153,9 @@ static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, O ss->register_closure(name, id, params, prepare, generic_closure_setup, generic_closure_compare); } -void OSLShader::register_closures(OSL::ShadingSystem *ss) +void OSLShader::register_closures(OSLShadingSystem *ss_) { + OSL::ShadingSystem *ss = (OSL::ShadingSystem*)ss_; int id = 0; register_closure(ss, "diffuse", id++, |