Commit: 3ed49f8bc92f5038b2068fc2165d98f55ac86dc0
Author: Brecht Van Lommel
Date: Fri Apr 1 20:37:24 2016 +0200
Branches: blender-v2.77-release
https://developer.blender.org/rB3ed49f8bc92f5038b2068fc2165d98f55ac86dc0
Fix T47505: Cycles OpenCL rendering crash on Windows.
Restore the boost bug workaround, but without changing the locale.
===================================================================
M intern/cycles/util/util_path.cpp
===================================================================
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index b7aa24a..adefcdb 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)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
