[Bf-blender-cvs] [89e562e] master: Cycles: Fix compilation error with latest OSL

Sergey Sharybin noreply at git.blender.org
Fri Jan 16 20:15:58 CET 2015

Commit: 89e562e19bba4098d01bed7402fec23d9660a89b
Author: Sergey Sharybin
Date:   Sat Jan 17 00:13:30 2015 +0500
Branches: master

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)
 	vector<string_view> options;
+	vector<string> options;
 	string stdosl_path;
 	string shader_path = path_get("shader");

More information about the Bf-blender-cvs mailing list