Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2013-12-28 01:38:46 +0400
committerMartijn Berger <martijn.berger@gmail.com>2013-12-28 01:38:46 +0400
commit114284b1fbec7c01092ade3ade2bae5464c7f7ac (patch)
tree9d882e1c2b7a342fcba1cd180947aa9cbd48dd04 /intern/cycles/util/util_path.cpp
parent1578b55c2716aba111a0a96d02b638dc8f597def (diff)
creation of path from std::string on Windows (VC10/11/12) crashes (access error)
Summary: Seems to be a known problem in boost: https://svn.boost.org/trac/boost/ticket/6320 Applied the solution but do not know if this is the right place. Reviewers: dingto, brecht Reviewed By: dingto Differential Revision: https://developer.blender.org/D140
Diffstat (limited to 'intern/cycles/util/util_path.cpp')
-rw-r--r--intern/cycles/util/util_path.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index e1f016babee..7777e2695d2 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -42,6 +42,11 @@ void path_init(const string& path, const string& user_path)
{
cached_path = path;
cached_user_path = user_path;
+
+#ifdef _MSC_VER
+ // fix for https://svn.boost.org/trac/boost/ticket/6320
+ boost::filesystem::path::imbue( std::locale( "" ) );
+#endif
}
string path_get(const string& sub)