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/svm/svm_closure.h | |
| parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
| parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) | |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'intern/cycles/kernel/svm/svm_closure.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_closure.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index fcda7ac6fe1..8409e83d94e 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -80,7 +80,12 @@ __device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *st case CLOSURE_BSDF_DIFFUSE_ID: { ShaderClosure *sc = svm_node_closure_get(sd); svm_node_closure_set_mix_weight(sc, mix_weight); - bsdf_diffuse_setup(sd, sc); + + float roughness = param1; + if(roughness == 0.0f) + bsdf_diffuse_setup(sd, sc); + else + bsdf_oren_nayar_setup(sd, sc, roughness); break; } case CLOSURE_BSDF_TRANSLUCENT_ID: { |