Commit: 89e562e19bba4098d01bed7402fec23d9660a89b
Author: Sergey Sharybin
Date: Sat Jan 17 00:13:30 2015 +0500
Branches: master
https://developer.blender.org/rB89e562e19bba4098d01bed7402fec23d9660a89b
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.
===================================================================
M intern/cycles/render/osl.cpp
===================================================================
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 08d6938..7ddfdaf 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");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
