diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-07-25 01:07:49 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-07-25 01:07:49 +0400 |
| commit | 6582215f87015f3909f318a5b8c3b5d48c968424 (patch) | |
| tree | e5be35881a21e238614bf2f3f8a19d7facbbfcd4 /intern/cycles/render/osl.cpp | |
| parent | 35f07cfc1bf29c88936347e1ba0211d0f1ee35c3 (diff) | |
Cycles: Updates for new OSL 1.5 API.
Differential Revision: https://developer.blender.org/D662
Patch by Sergey and myself.
Diffstat (limited to 'intern/cycles/render/osl.cpp')
| -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 94866102f60..fa7a242e77b 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -248,7 +248,11 @@ void OSLShaderManager::shading_system_free() bool OSLShaderManager::osl_compile(const string& inputfile, const string& outputfile) { +#if OSL_LIBRARY_VERSION_CODE >= 10500 + vector<string_view> options; +#else vector<string> options; +#endif string stdosl_path; /* specify output file name */ |