diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-05 22:39:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-05 22:43:46 +0300 |
| commit | 9a20ff2b526072afb6e3232c10afe4a23f533067 (patch) | |
| tree | c6a0b758b612fc0c803ae66955deeccde06c4442 /source/blender/imbuf | |
| parent | 4aaafcbc4568230a35d40535d58e83fb295d4f1e (diff) | |
Fix OS X build error after SSE changes, BLI_math_base.h conflicts with EXR headers.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 47fa4c1de0c..fdadb783815 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -38,6 +38,32 @@ #include <set> #include <errno.h> #include <algorithm> +#include <iostream> + +#include <half.h> +#include <Iex.h> +#include <ImfVersion.h> +#include <ImathBox.h> +#include <ImfArray.h> +#include <ImfIO.h> +#include <ImfChannelList.h> +#include <ImfPixelType.h> +#include <ImfInputFile.h> +#include <ImfOutputFile.h> +#include <ImfCompression.h> +#include <ImfCompressionAttribute.h> +#include <ImfStringAttribute.h> +#include <ImfStandardAttributes.h> + +/* multiview/multipart */ +#include <ImfMultiView.h> +#include <ImfMultiPartInputFile.h> +#include <ImfInputPart.h> +#include <ImfOutputPart.h> +#include <ImfMultiPartOutputFile.h> +#include <ImfTiledOutputPart.h> +#include <ImfPartType.h> +#include <ImfPartHelper.h> #include "DNA_scene_types.h" /* For OpenEXR compression constants */ @@ -74,33 +100,6 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void) #include "openexr_multi.h" } -#include <iostream> - -#include <half.h> -#include <Iex.h> -#include <ImfVersion.h> -#include <ImathBox.h> -#include <ImfArray.h> -#include <ImfIO.h> -#include <ImfChannelList.h> -#include <ImfPixelType.h> -#include <ImfInputFile.h> -#include <ImfOutputFile.h> -#include <ImfCompression.h> -#include <ImfCompressionAttribute.h> -#include <ImfStringAttribute.h> -#include <ImfStandardAttributes.h> - -/* multiview/multipart */ -#include <ImfMultiView.h> -#include <ImfMultiPartInputFile.h> -#include <ImfInputPart.h> -#include <ImfOutputPart.h> -#include <ImfMultiPartOutputFile.h> -#include <ImfTiledOutputPart.h> -#include <ImfPartType.h> -#include <ImfPartHelper.h> - extern "C" { #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" |