diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-16 22:13:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-16 22:15:47 +0300 |
| commit | 89e562e19bba4098d01bed7402fec23d9660a89b (patch) | |
| tree | 4dfcb7f4a6cd60aad16fc68dcaa856b2d9238423 /intern | |
| parent | 09ac6cae0941a6800d0fee1690b01d13e6283d9d (diff) | |
Cycles: Fix compilation error with latest OSL
They went back from string_view to string for compiler options.
Still having linking errors here, but maybe others will be more lucky to fully
compiler blender with new OSL.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/osl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 08d69386724..7ddfdaf6cc2 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -251,7 +251,11 @@ void OSLShaderManager::shading_system_free() bool OSLShaderManager::osl_compile(const string& inputfile, const string& outputfile) { +#if OSL_LIBRARY_VERSION_CODE < 10602 vector<string_view> options; +#else + vector<string> options; +#endif string stdosl_path; string shader_path = path_get("shader"); |