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/stdosl.h | |
| parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
| parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) | |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'intern/cycles/kernel/osl/nodes/stdosl.h')
| -rw-r--r-- | intern/cycles/kernel/osl/nodes/stdosl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/nodes/stdosl.h b/intern/cycles/kernel/osl/nodes/stdosl.h index 6fe4f52df4a..e4a110e737c 100644 --- a/intern/cycles/kernel/osl/nodes/stdosl.h +++ b/intern/cycles/kernel/osl/nodes/stdosl.h @@ -435,6 +435,7 @@ string concat (string a, string b, string c, string d, string e, string f) { // Closures closure color diffuse(normal N) BUILTIN; +closure color oren_nayar(normal N, float sigma) BUILTIN; closure color translucent(normal N) BUILTIN; closure color reflection(normal N, float eta) BUILTIN; closure color reflection(normal N) { return reflection (N, 0.0); } |