diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-01-12 16:30:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-13 14:12:36 +0300 |
| commit | 2cd091e9c70974703dd47845c5ad631035b849a4 (patch) | |
| tree | 02e99e12bac4deb0ee0e20d4ebd15ddfe915a4e2 /intern/cycles/render/osl.cpp | |
| parent | dc170a6d67826ee4201384f90065141ef4fae96e (diff) | |
Fix Cycles not taking into account CYCLES_SHADER_PATH for finding stdcycles.h
Contributed by howetuft.
Differential Revision: https://developer.blender.org/D9973
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 bea2c534bd1..35b62746f1b 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -323,7 +323,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/stdcycles.h"); + stdosl_path = path_join(shader_path, "stdcycles.h"); /* compile */ OSL::OSLCompiler *compiler = new OSL::OSLCompiler(&OSL::ErrorHandler::default_handler()); |