diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-07 11:15:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-07 11:15:30 +0300 |
| commit | 772a3dab21459637da69132aaac6b7b31173161f (patch) | |
| tree | dc0e98f149bb0d8cca48658922f085a29ab4ff4d /intern/cycles/kernel/osl/osl_globals.h | |
| parent | 3d313c9e5cad1020f0266a9ef6d83db9860ab0ec (diff) | |
Cycles: Update some types used form OSL
Some types were deprecated back in 2013, better to be prepared earlier for those
types being removed from upstream.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_globals.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_globals.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index e349ac676b0..916542ec628 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -51,10 +51,10 @@ struct OSLGlobals { OSLRenderServices *services; /* shader states */ - vector<OSL::ShadingAttribStateRef> surface_state; - vector<OSL::ShadingAttribStateRef> volume_state; - vector<OSL::ShadingAttribStateRef> displacement_state; - OSL::ShadingAttribStateRef background_state; + vector<OSL::ShaderGroupRef> surface_state; + vector<OSL::ShaderGroupRef> volume_state; + vector<OSL::ShaderGroupRef> displacement_state; + OSL::ShaderGroupRef background_state; /* attributes */ struct Attribute { |