diff options
| author | Martijn Berger <mberger@denc.com> | 2016-06-28 17:02:12 +0300 |
|---|---|---|
| committer | Martijn Berger <mberger@denc.com> | 2016-06-28 17:02:12 +0300 |
| commit | 5b325abf604954fc7172dfa3e436dca15897ab65 (patch) | |
| tree | c02730a6740940de25a7b3fba244cdf5dca1da19 /source/blender/imbuf | |
| parent | 23cc453975c42069bac21e849b1bf7e3e60cd8e7 (diff) | |
[msvc2015/OpenEXR] Linker hackery is no longer required in vc2015
Reviewers: juicyfruit
Reviewed By: juicyfruit
Differential Revision: https://developer.blender.org/D1892
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 611ada5b077..89e796fb7ee 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -77,7 +77,7 @@ extern "C" { // The following prevents a linking error in debug mode for MSVC using the libs in CVS -#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__) +#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__) && _MSC_VER < 1900 _CRTIMP void __cdecl _invalid_parameter_noinfo(void) { } |