diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
| commit | e6e265b2b59e02cc7816a2ed43471eca8bca0a62 (patch) | |
| tree | e312d2c2f6cb1aaf79148648e5725902ab23d34e /intern/cycles/kernel/osl/osl_closures.h | |
| parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
| parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) | |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'intern/cycles/kernel/osl/osl_closures.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/osl_closures.h index 20a759586b0..1b4288b8601 100644 --- a/intern/cycles/kernel/osl/osl_closures.h +++ b/intern/cycles/kernel/osl/osl_closures.h @@ -41,6 +41,7 @@ CCL_NAMESPACE_BEGIN enum { OSL_CLOSURE_BSDF_DIFFUSE_ID, + OSL_CLOSURE_BSDF_OREN_NAYAR_ID, OSL_CLOSURE_BSDF_TRANSLUCENT_ID, OSL_CLOSURE_BSDF_REFLECTION_ID, OSL_CLOSURE_BSDF_REFRACTION_ID, @@ -62,6 +63,7 @@ enum { }; extern OSL::ClosureParam bsdf_diffuse_params[]; +extern OSL::ClosureParam bsdf_oren_nayar_params[]; extern OSL::ClosureParam bsdf_translucent_params[]; extern OSL::ClosureParam bsdf_reflection_params[]; extern OSL::ClosureParam bsdf_refraction_params[]; @@ -82,6 +84,7 @@ extern OSL::ClosureParam closure_holdout_params[]; extern OSL::ClosureParam closure_subsurface_params[]; void bsdf_diffuse_prepare(OSL::RendererServices *, int id, void *data); +void bsdf_oren_nayar_prepare(OSL::RendererServices *, int id, void *data); void bsdf_translucent_prepare(OSL::RendererServices *, int id, void *data); void bsdf_reflection_prepare(OSL::RendererServices *, int id, void *data); void bsdf_refraction_prepare(OSL::RendererServices *, int id, void *data); |