[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32625] trunk/blender/source/blender/ blenkernel/intern/unit.c: Include BLI_math.h instead of math.h.

Nathan Letwory nathan at letworyinteractive.com
Thu Oct 21 09:29:15 CEST 2010


Revision: 32625
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32625
Author:   jesterking
Date:     2010-10-21 09:29:15 +0200 (Thu, 21 Oct 2010)

Log Message:
-----------
Include BLI_math.h instead of math.h.
Silence a warning.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/unit.c

Modified: trunk/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/unit.c	2010-10-21 07:21:34 UTC (rev 32624)
+++ trunk/blender/source/blender/blenkernel/intern/unit.c	2010-10-21 07:29:15 UTC (rev 32625)
@@ -26,11 +26,7 @@
 #include <string.h>
 #include "BKE_unit.h"
 
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#endif
-#include <math.h>
-
+#include "BLI_math.h"
 #include "BLI_winstuff.h"
 
 
@@ -687,7 +683,7 @@
 
 			found= unit_find_str(orig_str, unit->name_short);
 			if(found) {
-				int offset= found - orig_str;
+				int offset= (int)(found - orig_str);
 				int len_name= 0;
 
 				/* copy everything before the unit */





More information about the Bf-blender-cvs mailing list