[Bf-blender-cvs] [10e152c590e] master: imbuf/oiio: Resolve build warnings with MSVC.

Ray Molenkamp noreply at git.blender.org
Sat May 25 20:23:50 CEST 2019


Commit: 10e152c590e96069c13889a7489fa6b21127b800
Author: Ray Molenkamp
Date:   Sat May 25 12:23:48 2019 -0600
Branches: master
https://developer.blender.org/rB10e152c590e96069c13889a7489fa6b21127b800

imbuf/oiio: Resolve build warnings with MSVC.

math.h and oiio's missing_math.h where clashing over the
definitions of common math defines like M_PI.

===================================================================

M	source/blender/imbuf/intern/oiio/openimageio_api.cpp

===================================================================

diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
index 32079e4f290..7a47d0f7787 100644
--- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp
+++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
@@ -25,6 +25,7 @@
 
 #if defined(WIN32)
 #  include "utfconv.h"
+#  define _USE_MATH_DEFINES
 #endif
 
 // NOTE: Keep first, BLI_path_util conflicts with OIIO's format.



More information about the Bf-blender-cvs mailing list