diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-09-01 00:31:21 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-09-01 00:31:21 +0400 |
| commit | fda711a85185dc8ff5c399db038853c75c411e51 (patch) | |
| tree | f10575c4c132d89c2b97f80711b35375343f45a1 /intern/cycles/kernel/osl/osl_globals.h | |
| parent | 7ac0dd2953a3ceda968d5abf66fea6eb37372d45 (diff) | |
Cycles / OSLGlobals:
* Fixes for changes in the Open Shading Langauge API from version 0.6.0: https://github.com/imageworks/OpenShadingLanguage/commit/11ce51418b45e975ace4d919a4bdd8c2001ba300
* Removed the need for ShadingSystemImpl.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_globals.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index 90746c385c7..9a7985d6e95 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -60,7 +60,7 @@ struct OSLGlobals { /* thread key for thread specific data lookup */ struct ThreadData { OSL::ShaderGlobals globals; - void *thread_info; + OSL::PerThreadInfo *thread_info; }; static tls_ptr(ThreadData, thread_data); |