Commit: f8c650aa7a8fd72a85f9bb1297b02510b089702a Author: Sergey Sharybin Date: Thu Feb 5 12:06:24 2015 +0500 Branches: master https://developer.blender.org/rBf8c650aa7a8fd72a85f9bb1297b02510b089702a
Fix T43561: Wrong include path to standard OSL headers Issue was in fact only visible in certain circumstances: - OSL was compiled with Boost Wave - or system's cpp didn't handle space between -I and path Now made it so both wave and cpp code paths are always happy. Original patch from Shane Ambler with own modifications to mimic what variable holds on more verbose. =================================================================== M intern/cycles/render/osl.cpp =================================================================== diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 45b4d28..9d6f412 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -264,8 +264,8 @@ bool OSLShaderManager::osl_compile(const string& inputfile, const string& output options.push_back(outputfile); /* specify standard include path */ - options.push_back("-I"); - options.push_back(shader_path); + string include_path_arg = string("-I") + shader_path; + options.push_back(include_path_arg); stdosl_path = path_get("shader/stdosl.h"); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs