Revision: 39038
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39038
Author: jwilkins
Date: 2011-08-04 22:47:14 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
another attempt to fix MSVC 2010
(I do not like it when people can not just give me a patch that they've tested
for me already)
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
Modified:
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
===================================================================
---
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
2011-08-04 22:15:43 UTC (rev 39037)
+++
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
2011-08-04 22:47:14 UTC (rev 39038)
@@ -127,6 +127,15 @@
/* C99 stuff missing from MSVC 2008 and earlier */
#if _MSC_VER && _MSC_VER < 1600
+static inline float hypotf(float a, float b)
+{
+ return sqrtf(a*a + b*b);
+}
+
+#endif // _MSC_VER
+
+#ifdef _MSC_VER
+
#ifndef and
#define and &&
#endif
@@ -139,10 +148,6 @@
#define not !
#endif
-static inline float hypotf(float a, float b)
-{
- return sqrtf(a*a + b*b);
-}
#ifndef isfinite
#define isfinite(A) ((A) >= -DBL_MAX && (A) <= DBL_MAX)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
