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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-21 14:13:47 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-21 14:13:47 +0400
commitb11dc51974d48738b4e53c9c81971a045d73c5a6 (patch)
tree5fc50f9ae767982c8c7b58bdc8426471cd560fd9 /intern
parentf9373790730c67420d1b1d1f2990ddbbde4486d3 (diff)
Fix compiler warnings with westin OSL code.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/osl/osl_closures.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
index cc78c14ee85..51a7a03342e 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/osl_closures.cpp
@@ -181,6 +181,11 @@ void OSLShader::register_closures(OSLShadingSystem *ss_)
bsdf_ward_params(), bsdf_ward_prepare);
register_closure(ss, "ashikhmin_velvet", id++,
bsdf_ashikhmin_velvet_params(), bsdf_ashikhmin_velvet_prepare);
+ register_closure(ss, "westin_backscatter", id++,
+ bsdf_westin_backscatter_params(), bsdf_westin_backscatter_prepare);
+ register_closure(ss, "westin_sheen", id++,
+ bsdf_westin_sheen_params(), bsdf_westin_sheen_prepare);
+
register_closure(ss, "emission", id++,
closure_emission_params(), closure_emission_prepare);
register_closure(ss, "background", id++,
@@ -197,10 +202,6 @@ void OSLShader::register_closures(OSLShadingSystem *ss_)
closure_bsdf_diffuse_toon_params(), closure_bsdf_diffuse_toon_prepare);
register_closure(ss, "specular_toon", id++,
closure_bsdf_specular_toon_params(), closure_bsdf_specular_toon_prepare);
- register_closure(ss, "westin_backscatter", id++,
- closure_westin_backscatter_params(), closure_westin_backscatter_prepare);
- register_closure(ss, "westin_sheen", id++,
- closure_westin_sheen_params(), closure_westin_sheen_prepare);
register_closure(ss, "bssrdf_cubic", id++,
closure_bssrdf_params(), closure_bssrdf_prepare);
}