[Bf-blender-cvs] [e02d0de] master: Fix T47505: Cycles OpenCL rendering crash on Windows.

[Brecht Van Lommel]

Commit: e02d0de36e89cf2419dbbf36afd36d8d25b94c55
Author: Brecht Van Lommel
Date:   Fri Apr 1 20:37:24 2016 +0200
Branches: master
https://developer.blender.org/rBe02d0de36e89cf2419dbbf36afd36d8d25b94c55

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 196e2c4..7b936d3 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>
 
@@ -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)