From e02d0de36e89cf2419dbbf36afd36d8d25b94c55 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 1 Apr 2016 20:37:24 +0200 Subject: [PATCH] Fix T47505: Cycles OpenCL rendering crash on Windows. Restore the boost bug workaround, but without changing the locale. --- intern/cycles/util/util_path.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 196e2c49dcb..7b936d341d1 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -19,6 +19,7 @@ #include "util_path.h" #include "util_string.h" +#include #include #include @@ -334,6 +335,13 @@ void path_init(const string& path, const string& user_path) { cached_path = path; cached_user_path = user_path; + +#ifdef _MSC_VER + // workaround for https://svn.boost.org/trac/boost/ticket/6320 + // indirectly init boost codec here since it's not thread safe, and can + // cause crashes when it happens in multithreaded image load + OIIO::Filesystem::exists(path); +#endif } string path_get(const string& sub)