Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-07 11:15:30 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-07 11:15:30 +0300
commit772a3dab21459637da69132aaac6b7b31173161f (patch)
treedc0e98f149bb0d8cca48658922f085a29ab4ff4d /intern/cycles/render/shader.h
parent3d313c9e5cad1020f0266a9ef6d83db9860ab0ec (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/shader.h')
-rw-r--r--intern/cycles/render/shader.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index b19b1c619a2..954e1f56fff 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -118,10 +118,10 @@ public:
#ifdef WITH_OSL
/* osl shading state references */
- OSL::ShadingAttribStateRef osl_surface_ref;
- OSL::ShadingAttribStateRef osl_surface_bump_ref;
- OSL::ShadingAttribStateRef osl_volume_ref;
- OSL::ShadingAttribStateRef osl_displacement_ref;
+ OSL::ShaderGroupRef osl_surface_ref;
+ OSL::ShaderGroupRef osl_surface_bump_ref;
+ OSL::ShaderGroupRef osl_volume_ref;
+ OSL::ShaderGroupRef osl_displacement_ref;
#endif
Shader();