diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-26 10:34:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-26 10:34:13 +0300 |
| commit | ea339dc62c37b891b8b0c0a8e56f7848b3de5fe9 (patch) | |
| tree | b4465742e8e0aad531ab387eb5da950fc51d2c91 /source/blender/imbuf | |
| parent | e6825946d057f077f5473366b4fa4d383484a81c (diff) | |
| parent | df237b964b9c24c9ab315f6f31bf67990f1c2f7e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index a52ae75e87b..13c033523fa 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -40,6 +40,9 @@ #include <algorithm> #include <iostream> + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" #include <half.h> #include <Iex.h> #include <ImfVersion.h> @@ -64,6 +67,7 @@ #include <ImfTiledOutputPart.h> #include <ImfPartType.h> #include <ImfPartHelper.h> +#pragma clang diagnostic pop #include "DNA_scene_types.h" /* For OpenEXR compression constants */ |