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/nodes/node_diffuse_bsdf.osl | |
| parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
| parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) | |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl')
| -rw-r--r-- | intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl b/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl index 8cf161c17cc..6075b7c93f3 100644 --- a/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl +++ b/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl @@ -20,9 +20,13 @@ shader node_diffuse_bsdf( color Color = color(0.8, 0.8, 0.8), + float Roughness = 0.0, normal Normal = N, output closure color BSDF = diffuse(Normal)) { - BSDF = Color*diffuse(Normal); + if(Roughness == 0.0) + BSDF = Color * diffuse(Normal); + else + BSDF = Color * oren_nayar(Normal, Roughness); } |