Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2019-08-01 18:05:53 +0300
committerAntonio Vazquez <blendergit@gmail.com>2019-08-01 18:05:53 +0300
commit03bbd5f9dedf7b3dfea7119c172c61f0b50ae28c (patch)
tree79ab34e79af6a700c6f73f331e4ee4e253ab3751 /source/creator/creator.c
parent2204bfcf9e1c3a38e60830bd97775dd72158f4d6 (diff)
parent49b2162309da6abf66764d41d9fc4c45ad01936c (diff)
Merge branch 'master' into temp-gpencil-drw-engine
Diffstat (limited to 'source/creator/creator.c')
-rw-r--r--source/creator/creator.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c
index b257564519a..d6e1d7e7f5f 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -25,9 +25,6 @@
#include <string.h>
#ifdef WIN32
-# if defined(_MSC_VER) && defined(_M_X64)
-# include <math.h> /* needed for _set_FMA3_enable */
-# endif
# include <windows.h>
# include "utfconv.h"
#endif
@@ -237,12 +234,6 @@ int main(int argc,
_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!)
@@ -505,7 +496,7 @@ int main(int argc,
#ifdef WITH_PYTHON_MODULE
void main_python_exit(void)
{
- WM_exit_ext((bContext *)evil_C, true);
+ WM_exit_ex((bContext *)evil_C, true);
evil_C = NULL;
}
#endif