diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-26 18:38:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-27 14:22:01 +0300 |
| commit | 1107af1abb0d4bf271e995a18f5d4bd790d51d02 (patch) | |
| tree | a5cc6e1390176cdb62bf40870d4dd5a5b18ee617 /source/blender/imbuf | |
| parent | 9cacadc8a637cc6c96380f73c4bfd1d6967351bd (diff) | |
Fix OBJECT_GUARDED_FREE compiler error when type is in namespace
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index d2147f833c3..e001b8b21c4 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -33,9 +33,9 @@ #include "openimageio_api.h" #include <OpenImageIO/imageio.h> -extern "C" { #include "MEM_guardedalloc.h" +extern "C" { #include "BLI_blenlib.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 88dfa42a416..e1513169736 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -65,6 +65,8 @@ # include "utfconv.h" #endif +#include "MEM_guardedalloc.h" + extern "C" { // The following prevents a linking error in debug mode for MSVC using the libs in CVS @@ -74,8 +76,6 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void) } #endif -#include "MEM_guardedalloc.h" - #include "BLI_blenlib.h" #include "BLI_math_color.h" #include "BLI_threads.h" |