diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-26 18:42:33 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-26 18:42:33 +0300 |
| commit | b4c01aca30faa16900084c081faff6fbaf130872 (patch) | |
| tree | 51e66b197e1706b22fd6b832c4a223ebdfb1b375 /source/blender/imbuf | |
| parent | d5a42bce38fd6548728b47a4ec76afdd75668341 (diff) | |
| parent | 599e979d90327c1e10031f992cb2be2cda414825 (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, 0 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 13c033523fa..a52ae75e87b 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -40,9 +40,6 @@ #include <algorithm> #include <iostream> - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-register" #include <half.h> #include <Iex.h> #include <ImfVersion.h> @@ -67,7 +64,6 @@ #include <ImfTiledOutputPart.h> #include <ImfPartType.h> #include <ImfPartHelper.h> -#pragma clang diagnostic pop #include "DNA_scene_types.h" /* For OpenEXR compression constants */ |