[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23074] branches/bmesh/blender/source/ blender/blenkernel: gcc compile fix
Joseph Eagar
joeedh at gmail.com
Wed Sep 9 09:05:04 CEST 2009
Revision: 23074
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23074
Author: joeedh
Date: 2009-09-09 09:05:04 +0200 (Wed, 09 Sep 2009)
Log Message:
-----------
gcc compile fix
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2009-09-09 06:28:58 UTC (rev 23073)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h 2009-09-09 07:05:04 UTC (rev 23074)
@@ -241,9 +241,9 @@
/*little macro so inline keyword works*/
#if defined(_MSC_VER)
-#define BM_INLINE __forceinline
+#define BM_INLINE static __forceinline
#else
-#define BM_INLINE inline
+#define BM_INLINE static inline
#endif
#define BMEMSET(mem, val, size) {int _i; char *_c = mem; for (_i=0; _i<size; _i++) *_c++ = val;}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2009-09-09 06:28:58 UTC (rev 23073)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2009-09-09 07:05:04 UTC (rev 23074)
@@ -406,6 +406,7 @@
#define _E(s, i) ((BMVert**)(s)->data.buf)[i]
+#if 0
/*calculate merge mapping*/
if (j == 0) {
BMOperator findop;
@@ -438,30 +439,25 @@
BMO_ITER(v, &oiter, em->bm, &findop, "targetmapout", 0) {
v2 = BMO_IterMapValp(&oiter);
- /*make sure merge pairs are duplicate-to-duplicate*/
- /*if (BMINDEX_GET(v) >= s1->len && BMINDEX_GET(v2) >= s1->len)
- continue;
- else if (BMINDEX_GET(v) < s1->len && BMINDEX_GET(v2) < s1->len)
- continue;*/
-
indexMap[BMINDEX_GET(v)] = BMINDEX_GET(v2)+1;
}
BMO_Finish_Op(em->bm, &findop);
}
+#endif
/*generate merge mappping using index map. we do this by using the
operator slots as lookup arrays.*/
#define E(i) (i) < s1->len ? _E(s1, i) : _E(s2, (i)-s1->len)
- for (i=0; i<indexLen; i++) {
+ /*for (i=0; i<indexLen; i++) {
if (!indexMap[i]) continue;
v = E(i);
v2 = E(indexMap[i]-1);
BMO_Insert_MapPointer(em->bm, &weldop, "targetmap", v, v2);
- }
+ }*/
#undef E
#undef _E
@@ -483,7 +479,7 @@
cddm = CDDM_from_BMEditMesh(em, NULL);
BMEdit_Free(em);
- MEM_freeN(indexMap);
+ //MEM_freeN(indexMap);
return cddm;
}
More information about the Bf-blender-cvs
mailing list