diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-02-12 07:40:23 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-12 07:40:23 +0300 |
| commit | df1e9b662bd6938f74579cea9d30341f3b6dd02b (patch) | |
| tree | e71eb89d09b33a06b1fd75f71d683b631ea415ef /intern/cycles/render/osl.cpp | |
| parent | 6a28d14f7236b3e6fbe7409da9ee916878d65feb (diff) | |
Cleanup: Fix build warnings from OSL shader compilation
There were to copies of stdosl.h one from stock OSL
and one in the cycles tree augmented with cycles
specific closures.
moved the cycles ones to stdcycles.h and copied
the stock stdosl.h and accompanying headers from
the OSL shader folder.
for further details see D6812.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D6812
Diffstat (limited to 'intern/cycles/render/osl.cpp')
| -rw-r--r-- | intern/cycles/render/osl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 1f0a243e6c1..b3916a67f0c 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -319,7 +319,7 @@ bool OSLShaderManager::osl_compile(const string &inputfile, const string &output string include_path_arg = string("-I") + shader_path; options.push_back(include_path_arg); - stdosl_path = path_get("shader/stdosl.h"); + stdosl_path = path_get("shader/stdcycles.h"); /* compile */ OSL::OSLCompiler *compiler = new OSL::OSLCompiler(&OSL::ErrorHandler::default_handler()); |