diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2021-10-24 15:31:22 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2021-10-24 15:31:22 +0300 |
| commit | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (patch) | |
| tree | 7fa65e43d5a9bac6496555b723f37e0031e2737e /intern/cycles/render/osl.h | |
| parent | fc171c1be9da36485e892339b86dc8d4251914af (diff) | |
| parent | 6ce383a9dfba5c49a48676c3a651804fde3dfe34 (diff) | |
Merge branch 'master' into soc-2020-io-performance
Diffstat (limited to 'intern/cycles/render/osl.h')
| -rw-r--r-- | intern/cycles/render/osl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h index 019dca16df7..1da8d8d0026 100644 --- a/intern/cycles/render/osl.h +++ b/intern/cycles/render/osl.h @@ -79,7 +79,7 @@ class OSLShaderManager : public ShaderManager { return true; } - void host_update_specific(Device *device, Scene *scene, Progress &progress) override; + void host_update_specific(Scene *scene, Progress &progress) override; void device_update_specific(Device *device, DeviceScene *dscene, @@ -140,7 +140,7 @@ class OSLCompiler { OSL::ShadingSystem *shadingsys, Scene *scene); #endif - void compile(OSLGlobals *og, Shader *shader); + void compile(Shader *shader); void add(ShaderNode *node, const char *name, bool isfilepath = false); |