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

Further fix for T37817: non-ascii paths fix in Cycles broke OSL rendering.

Browse Source 
Not quite sure yet what is going on here, but this works for me.
This commit is contained in:
Brecht Van Lommel 2014-01-14 19:15:58 +01:00
parent 6e8321f2c0
commit d980c3eccb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/util/util_path.cpp
View File

@ -42,19 +42,19 @@ static string cached_user_path = "";
static boost::filesystem::path to_boost(const string& path) static boost::filesystem::path to_boost(const string& path)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
std::wstring path_utf16 = Strutil::utf8_to_utf16(path); std::wstring path_utf16 = Strutil::utf8_to_utf16(path.c_str());
return boost::filesystem::path(path_utf16); return boost::filesystem::path(path_utf16.c_str());
#else #else
return boost::filesystem::path(path); return boost::filesystem::path(path.c_str());
#endif #endif
} }
static string from_boost(const boost::filesystem::path& path) static string from_boost(const boost::filesystem::path& path)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
return Strutil::utf16_to_utf8(path.wstring()); return Strutil::utf16_to_utf8(path.wstring().c_str());
#else #else
return path.string(); return path.string().c_str();
#endif #endif
} }