Commit: ad2bf24a19084360babf3db09197499bfaaa251a
Author: Benoit Bolsee
Date: Wed May 18 22:56:31 2016 +0200
Branches: decklink
https://developer.blender.org/rBad2bf24a19084360babf3db09197499bfaaa251a
Merge remote-tracking branch 'origin/master' into decklink
Conflicts:
intern/atomic/atomic_ops.h
===================================================================
===================================================================
diff --cc source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 52ebe2c,ac2e4df..30ad5b3
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@@ -433,8 -444,35 +444,36 @@@ int main
int validArguments=0;
bool samplesParFound = false;
GHOST_TUns16 aasamples = 0;
+ int alphaBackground = 0;
+ #ifdef WIN32
+ char **argv;
+ int argv_num;
+
+ /* We delay loading of openmp so we can set the policy here. */
+ # if defined(_MSC_VER)
+ _putenv_s("OMP_WAIT_POLICY", "PASSIVE");
+ # endif
+
+ /* FMA3 support in the 2013 CRT is broken on Vista and Windows 7 RTM
(fixed in SP1). Just disable it. */
+ # if defined(_MSC_VER) && defined(_M_X64)
+ _set_FMA3_enable(0);
+ # endif
+
+ /* Win32 Unicode Args */
+ /* NOTE: cannot use guardedalloc malloc here, as it's not yet
initialized
+ * (it depends on the args passed in, which is what we're getting
here!)
+ */
+ {
+ wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(),
&argc);
+ argv = (char**)malloc(argc * sizeof(char *));
+ for (argv_num = 0; argv_num < argc; argv_num++) {
+ argv[argv_num] = alloc_utf_8_from_16(argv_16[argv_num],
0);
+ }
+ LocalFree(argv_16);
+ }
+ #endif /* WIN32 */
+
#ifdef __linux__
#ifdef __alpha__
signal (SIGFPE, SIG_IGN);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
