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 /intern/cycles/util | |
| parent | e6825946d057f077f5473366b4fa4d383484a81c (diff) | |
| parent | df237b964b9c24c9ab315f6f31bf67990f1c2f7e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_image.h | 4 | ||||
| -rw-r--r-- | intern/cycles/util/util_param.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/util/util_image.h b/intern/cycles/util/util_image.h index 18876841b5b..38694c87d0e 100644 --- a/intern/cycles/util/util_image.h +++ b/intern/cycles/util/util_image.h @@ -19,7 +19,11 @@ /* OpenImageIO is used for all image file reading and writing. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" +#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OpenImageIO/imageio.h> +#pragma clang diagnostic pop #include "util/util_vector.h" diff --git a/intern/cycles/util/util_param.h b/intern/cycles/util/util_param.h index 69bcbf80a78..419a8010d5a 100644 --- a/intern/cycles/util/util_param.h +++ b/intern/cycles/util/util_param.h @@ -20,9 +20,13 @@ /* Parameter value lists from OpenImageIO are used to store custom properties * on various data, which can then later be used in shaders. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" +#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OpenImageIO/paramlist.h> #include <OpenImageIO/typedesc.h> #include <OpenImageIO/ustring.h> +#pragma clang diagnostic pop CCL_NAMESPACE_BEGIN |