diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-04-01 21:37:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-05 11:36:13 +0300 |
| commit | 3ed49f8bc92f5038b2068fc2165d98f55ac86dc0 (patch) | |
| tree | ef80836d11337034818bd3031d7117b146a6729a | |
| parent | 0f3d5589825819e98e2bf7350ca776673a3e598e (diff) | |
Fix T47505: Cycles OpenCL rendering crash on Windows.
Restore the boost bug workaround, but without changing the locale.
| -rw-r--r-- | intern/cycles/util/util_path.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index b7aa24a831f..adefcdb9997 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 <OpenImageIO/filesystem.h> #include <OpenImageIO/strutil.h> #include <OpenImageIO/sysutil.h> @@ -335,6 +336,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) |