Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix compilation with older OSL

Browse Source 
We didn't switch to OSL-1.6.9 on all platforms yet,
so please keep codeabse compiled with 1.5 for the
time being.
This commit is contained in:
Sergey Sharybin
2016-01-16 22:46:23 +05:00
parent 8acf14c55c
commit 1c71b8e323
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/osl.cpp
View File

@@ -282,7 +282,11 @@ bool OSLShaderManager::osl_compile(const string& inputfile, const string& output
stdosl_path = path_get("shader/stdosl.h"); stdosl_path = path_get("shader/stdosl.h");
/* compile */ /* compile */
#if OSL_LIBRARY_VERSION_CODE >= 10602
OSL::OSLCompiler *compiler = new OSL::OSLCompiler(&OSL::ErrorHandler::default_handler()); OSL::OSLCompiler *compiler = new OSL::OSLCompiler(&OSL::ErrorHandler::default_handler());
#else
OSL::OSLCompiler *compiler = new OSL::OSLCompiler();
#endif
bool ok = compiler->compile(string_view(inputfile), options, string_view(stdosl_path)); bool ok = compiler->compile(string_view(inputfile), options, string_view(stdosl_path));
delete compiler; delete compiler;