diff options
| -rw-r--r-- | intern/opencolorio/ocio_impl.cc | 7 | ||||
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index bf5590077ef..82536a74159 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -29,7 +29,14 @@ #include <sstream> #include <string.h> +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4251 4275) +#endif #include <OpenColorIO/OpenColorIO.h> +#ifdef _MSC_VER +# pragma warning(pop) +#endif using namespace OCIO_NAMESPACE; diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 42bd20d2eb1..bf91ea143da 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -39,7 +39,15 @@ #include "glew-mx.h" +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4251 4275) +#endif #include <OpenColorIO/OpenColorIO.h> +#ifdef _MSC_VER +# pragma warning(pop) +#endif + using namespace OCIO_NAMESPACE; |