diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-06-26 17:07:39 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-06-26 17:07:39 +0300 |
| commit | fbaf6e6fb3d2eb2f0c737b7d4713a5ea171738e6 (patch) | |
| tree | 35bfa54eef6240693a13d594bb49ed7c8d33b32e /source/blender/imbuf/intern | |
| parent | bba0ad903cfa407368c78b0b8480b1a729474305 (diff) | |
| parent | c07f2bc89196ea449a2875634eb85efa45733fb5 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into temp-dynamic-overridestemp-dynamic-overrides
Diffstat (limited to 'source/blender/imbuf/intern')
| -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 */ |