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/render/osl.cpp | |
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/render/osl.cpp')
-rw-r--r-- | intern/cycles/render/osl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index e5842c796db..a75716e9f68 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -765,13 +765,13 @@ void OSLCompiler::generate_nodes(const ShaderNodeSet& nodes) } while(!nodes_done); } -OSL::ShadingAttribStateRef OSLCompiler::compile_type(Shader *shader, ShaderGraph *graph, ShaderType type) +OSL::ShaderGroupRef OSLCompiler::compile_type(Shader *shader, ShaderGraph *graph, ShaderType type) { OSL::ShadingSystem *ss = (OSL::ShadingSystem*)shadingsys; current_type = type; - OSL::ShadingAttribStateRef group = ss->ShaderGroupBegin(shader->name.c_str()); + OSL::ShaderGroupRef group = ss->ShaderGroupBegin(shader->name.c_str()); ShaderNode *output = graph->output(); ShaderNodeSet dependencies; @@ -850,8 +850,8 @@ void OSLCompiler::compile(Scene *scene, OSLGlobals *og, Shader *shader) shader->has_surface = true; } else { - shader->osl_surface_ref = OSL::ShadingAttribStateRef(); - shader->osl_surface_bump_ref = OSL::ShadingAttribStateRef(); + shader->osl_surface_ref = OSL::ShaderGroupRef(); + shader->osl_surface_bump_ref = OSL::ShaderGroupRef(); } /* generate volume shader */ @@ -860,7 +860,7 @@ void OSLCompiler::compile(Scene *scene, OSLGlobals *og, Shader *shader) shader->has_volume = true; } else - shader->osl_volume_ref = OSL::ShadingAttribStateRef(); + shader->osl_volume_ref = OSL::ShaderGroupRef(); /* generate displacement shader */ if(shader->used && graph && output->input("Displacement")->link) { @@ -868,7 +868,7 @@ void OSLCompiler::compile(Scene *scene, OSLGlobals *og, Shader *shader) shader->has_displacement = true; } else - shader->osl_displacement_ref = OSL::ShadingAttribStateRef(); + shader->osl_displacement_ref = OSL::ShaderGroupRef(); } /* push state to array for lookup */ |