diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-08-01 22:27:08 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-08-01 22:27:08 +0300 |
| commit | f04a5ad1e44c389f260d6c36ead72abac9b22384 (patch) | |
| tree | 84f7fd5883a46fbeafa852cf25804fa8b2dfd3d8 /source/creator | |
| parent | ab1455e9720fbcd20707562df0a7943b902555a5 (diff) | |
| parent | aa0322524ea6f59068dc4ea9cef5e6f3e2a7979a (diff) | |
Merge branch 'master' into soc-2019-openxr
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/creator.c | 11 | ||||
| -rw-r--r-- | source/creator/creator_signals.c | 5 |
2 files changed, 2 insertions, 14 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 diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c index 5dae5c5d808..5a5bc74d2d3 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -31,9 +31,6 @@ # endif # ifdef WIN32 -# if defined(_MSC_VER) && defined(_M_X64) -# include <math.h> /* needed for _set_FMA3_enable */ -# endif # include <windows.h> # include <float.h> # endif @@ -311,7 +308,7 @@ void main_signal_setup(void) void main_signal_setup_background(void) { - /* for all platforms, even windos has it! */ + /* for all platforms, even windows has it! */ BLI_assert(G.background); # if !defined(WITH_HEADLESS) |