[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40408] trunk/blender/source/blender: Another set of fixes for MSVC

[Sergey Sharybin]

Revision: 40408
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40408
Author:   nazgul
Date:     2011-09-20 17:23:52 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Another set of fixes for MSVC

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h
    trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
    trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c

Modified: trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h	2011-09-20 17:23:43 UTC (rev 40407)
+++ trunk/blender/source/blender/blenkernel/BKE_navmesh_conversion.h	2011-09-20 17:23:52 UTC (rev 40408)
@@ -61,4 +61,5 @@
 int polyFindVertex(const unsigned short* p, const int vertsPerPoly, unsigned short vertexIdx);
 float distPointToSegmentSq(const float* point, const float* a, const float* b);
 
+
 #endif //NAVMESH_CONVERSION_H

Modified: trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c	2011-09-20 17:23:43 UTC (rev 40407)
+++ trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c	2011-09-20 17:23:52 UTC (rev 40408)
@@ -37,16 +37,17 @@
 #include "BKE_navmesh_conversion.h"
 #include "BKE_cdderivedmesh.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_math.h"
 
 #include "recast-capi.h"
 
-inline float area2(const float* a, const float* b, const float* c)
+BM_INLINE float area2(const float* a, const float* b, const float* c)
 {
 	return (b[0] - a[0]) * (c[2] - a[2]) - (c[0] - a[0]) * (b[2] - a[2]);
 }
 
-inline int left(const float* a, const float* b, const float* c)
+BM_INLINE int left(const float* a, const float* b, const float* c)
 {
 	return area2(a, b, c) < 0;
 }

Modified: trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c	2011-09-20 17:23:43 UTC (rev 40407)
+++ trunk/blender/source/blender/modifiers/intern/MOD_navmesh.c	2011-09-20 17:23:52 UTC (rev 40408)
@@ -48,12 +48,12 @@
 #include "BKE_customdata.h"
 #include "MEM_guardedalloc.h"
 
-static int bit(int a, int b)
+BM_INLINE int bit(int a, int b)
 {
 	return (a & (1 << b)) >> b;
 }
 
-static void intToCol(int i, float* col)
+BM_INLINE void intToCol(int i, float* col)
 {
 	int	r = bit(i, 0) + bit(i, 3) * 2 + 1;
 	int	g = bit(i, 1) + bit(i, 4) * 2 + 1;