sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T41318: OSL broken on Linux kubuntu 14.04

Browse Source 
Now for real, hopefully.
This commit is contained in:
Sergey Sharybin 2014-08-05 15:53:00 +06:00
parent b9c8572d71
commit b3e3ca7464
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,12 +248,13 @@ 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;
#if OSL_LIBRARY_VERSION_CODE < 10500
typedef string string_view;
#endif
vector<string_view> options;
string stdosl_path;
string shader_path = path_get("shader");
/* specify output file name */
options.push_back("-o");
@ -261,17 +262,13 @@ bool OSLShaderManager::osl_compile(const string& inputfile, const string& output
/* specify standard include path */
options.push_back("-I");
options.push_back(path_get("shader"));
options.push_back(shader_path);
stdosl_path = path_get("shader/stdosl.h");
/* compile */
OSL::OSLCompiler *compiler = OSL::OSLCompiler::create();
#if OSL_LIBRARY_VERSION_CODE >= 10500
bool ok = compiler->compile(string_view(inputfile), options, string_view(stdosl_path));
#else
bool ok = compiler->compile(inputfile, options, stdosl_path);
#endif
delete compiler;
return ok;