[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38816] branches/soc-2011-onion: stuff to make onion compile in cmake+gcc with brushlib.

[Antony Riakiotakis]

Revision: 38816
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38816
Author:   psy-fi
Date:     2011-07-29 12:33:18 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
stuff to make onion compile in cmake+gcc with brushlib. generate.py not called for brushlib, had to do it manually

Modified Paths:
--------------
    branches/soc-2011-onion/extern/brushlib/brush.hpp
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp

Modified: branches/soc-2011-onion/extern/brushlib/brush.hpp
===================================================================
--- branches/soc-2011-onion/extern/brushlib/brush.hpp	2011-07-29 10:47:37 UTC (rev 38815)
+++ branches/soc-2011-onion/extern/brushlib/brush.hpp	2011-07-29 12:33:18 UTC (rev 38816)
@@ -577,7 +577,7 @@
 
       tilt_ascension = 180.0*atan2(-xtilt, ytilt)/M_PI;
       float e;
-      if (abs(xtilt) > abs(ytilt)) {
+      if (fabs(xtilt) > fabs(ytilt)) {
         e = sqrt(1+ytilt*ytilt);
       } else {
         e = sqrt(1+xtilt*xtilt);

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-07-29 10:47:37 UTC (rev 38815)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp	2011-07-29 12:33:18 UTC (rev 38816)
@@ -99,7 +99,7 @@
 
 
 /* C99 stuff missing from MSVC */
-
+#ifdef MSVC
 #ifndef and
 #define and &&
 #endif
@@ -111,8 +111,9 @@
 #ifndef not
 #define not !
 #endif
+#endif
 
-static float hypotf(float a, float b)
+float hypotf(float a, float b)
 {
 	return sqrtf(a*a + b*b);
 }