griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gcc compile fix

Browse Source
This commit is contained in:
Joseph Eagar
2009-09-09 07:05:04 +00:00
parent e0a014a45f
commit e297d7afb0
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_utildefines.h
View File

@@ -241,9 +241,9 @@ behaviour, though it may not be the best in practice.
/*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;}

14
source/blender/blenkernel/intern/modifiers_bmesh.c
View File

@@ -406,6 +406,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
#define _E(s, i) ((BMVert**)(s)->data.buf)[i]
#if 0
/*calculate merge mapping*/
if (j == 0) {
BMOperator findop;
@@ -438,30 +439,25 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
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 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
cddm = CDDM_from_BMEditMesh(em, NULL);
BMEdit_Free(em);
MEM_freeN(indexMap);
//MEM_freeN(indexMap);
return cddm;
}