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

fix for error in editmesh derived callbacks, emDM_getVert(), emDM_getEdge(), emDM_getTessFace().

Browse Source 
Currently the functions aren't used since they would fail have failed immediately.
This commit is contained in:
Campbell Barton
2013-04-13 20:40:34 +00:00
parent 6da961775f
commit 5996242291
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/editderivedmesh.c
View File

@@ -370,10 +370,6 @@ typedef struct EditDerivedBMesh {
float (*vertexCos)[3];
float (*vertexNos)[3];
float (*polyNos)[3];
/* private variables, for number of verts/edges/faces
* within the above hash/table members */
int tv, te, tf;
} EditDerivedBMesh;
static void emDM_calcNormals(DerivedMesh *UNUSED(dm))
@@ -1387,8 +1383,8 @@ static void emDM_getVert(DerivedMesh *dm, int index, MVert *vert_r)
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMVert *ev;
if (index < 0 || index >= bmdm->tv) {
printf("error in emDM_getVert.\n");
if (UNLIKELY(index < 0 || index >= bmdm->em->bm->totvert)) {
BLI_assert(!"error in emDM_getVert");
return;
}
@@ -1407,8 +1403,8 @@ static void emDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r)
BMEdge *e;
float *f;
if (index < 0 || index >= bmdm->te) {
printf("error in emDM_getEdge.\n");
if (UNLIKELY(index < 0 || index >= bmdm->em->bm->totedge)) {
BLI_assert(!"error in emDM_getEdge");
return;
}
@@ -1434,8 +1430,8 @@ static void emDM_getTessFace(DerivedMesh *dm, int index, MFace *face_r)
BMFace *ef;
BMLoop **ltri;
if (index < 0 || index >= bmdm->tf) {
printf("error in emDM_getTessFace.\n");
if (UNLIKELY(index < 0 || index >= bmdm->em->tottri)) {
BLI_assert(!"error in emDM_getTessFace");
return;
}