[Bf-blender-cvs] [b30ab24] master: Cycles: Avoid re-definition of math cnstants with MSVC

Sergey Sharybin noreply at git.blender.org
Sat Feb 20 14:07:17 CET 2016


Commit: b30ab24fb823b83256fe981843069a1d73c5bbb8
Author: Sergey Sharybin
Date:   Sat Feb 20 11:37:24 2016 +0500
Branches: master
https://developer.blender.org/rBb30ab24fb823b83256fe981843069a1d73c5bbb8

Cycles: Avoid re-definition of math cnstants with MSVC

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

M	intern/cycles/util/util_math.h

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

diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index f3fd1b3..cdbc37f 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -24,10 +24,6 @@
 
 #ifndef __KERNEL_OPENCL__
 
-#ifdef _MSC_VER
-#  define _USE_MATH_DEFINES
-#endif
-
 #include <float.h>
 #include <math.h>
 #include <stdio.h>




More information about the Bf-blender-cvs mailing list