diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-05 10:06:24 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-05 10:34:29 +0300 |
commit | f8c650aa7a8fd72a85f9bb1297b02510b089702a (patch) | |
tree | d5a4f78274d9510aa543ef1f6d6f6f6a50ce8281 | |
parent | 57e1a5373f41e0cd6c628abdc836fd807ffc4adf (diff) |
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.
-rw-r--r-- | intern/cycles/render/osl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 45b4d283c07..9d6f412d9ce 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"); |