diff options
| author | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
|---|---|---|
| committer | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
| commit | e734491048ef2436af41e272b8900f20785ecbe6 (patch) | |
| tree | 8cee3fc068c782c0ba8cb9a581e768968c565569 /intern/cycles/kernel/osl/osl_services.h | |
| parent | f21cd0881948f6eaf16af0b354cd904df7407bda (diff) | |
| parent | 204b01a254ac2445fea217e5211b2ed6aef631ca (diff) | |
Merge branch 'master' into soc-2021-knife-toolssoc-2021-knife-tools
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 891b9172dd4..58accb46e7d 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -250,10 +250,18 @@ class OSLRenderServices : public OSL::RendererServices { void *data) override; #endif - static bool get_background_attribute( - KernelGlobals *kg, ShaderData *sd, ustring name, TypeDesc type, bool derivatives, void *val); - static bool get_object_standard_attribute( - KernelGlobals *kg, ShaderData *sd, ustring name, TypeDesc type, bool derivatives, void *val); + static bool get_background_attribute(const KernelGlobals *kg, + ShaderData *sd, + ustring name, + TypeDesc type, + bool derivatives, + void *val); + static bool get_object_standard_attribute(const KernelGlobals *kg, + ShaderData *sd, + ustring name, + TypeDesc type, + bool derivatives, + void *val); static ustring u_distance; static ustring u_index; |