diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 18:22:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 18:22:46 +0400 |
commit | ac4579d4c9de9daeaa3a2b8ce79822c33a995084 (patch) | |
tree | f08cad5f64c5e78ee86fea09cd2be393ab5e6736 /source/blender | |
parent | bf4deba4d5bdbad8611d2fdd7f796fe785cac4a5 (diff) |
syncing with trunk, remove unused function
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/mesh/editbmesh_bvh.c | 44 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 20 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
3 files changed, 16 insertions, 50 deletions
diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editbmesh_bvh.c index 4d2262f6a20..361a7a76368 100644 --- a/source/blender/editors/mesh/editbmesh_bvh.c +++ b/source/blender/editors/mesh/editbmesh_bvh.c @@ -620,50 +620,6 @@ static float topo_compare(BMesh *bm, BMVert *v1, BMVert *v2) return 1.0f - w; } -static void vertsearchcallback_topo(void *userdata, int index, const float *UNUSED(co), BVHTreeNearest *UNUSED(hit)) -{ - BMBVHTree *tree = userdata; - BMLoop **ls = tree->em->looptris[index]; - int i; - float vec[3], w; - - for (i=0; i<3; i++) { - float dis; - - if (BLI_ghash_haskey(tree->gh, ls[i]->v)) - continue; - - sub_v3_v3v3(vec, tree->co, ls[i]->v->co); - dis = dot_v3v3(vec, vec); - - w = topo_compare(tree->em->bm, tree->v, ls[i]->v); - tree->curtag++; - - if (w < tree->curw-FLT_EPSILON*4) { - tree->curw = w; - tree->curv = ls[i]->v; - - sub_v3_v3v3(vec, tree->co, ls[i]->v->co); - tree->curd = dot_v3v3(vec, vec); - - /*we deliberately check for equality using (smallest possible float)*4 - comparison factor, to always prefer distance in cases of verts really - close to each other*/ - } else if (fabs(tree->curw - w) < FLT_EPSILON*4) { - /*if w is equal to hitex->curw, sort by distance*/ - sub_v3_v3v3(vec, tree->co, ls[i]->v->co); - dis = dot_v3v3(vec, vec); - - if (dis < tree->curd) { - tree->curd = dis; - tree->curv = ls[i]->v; - } - } - - BLI_ghash_insert(tree->gh, ls[i]->v, NULL); - } -} - #if 0 //BMESH_TODO: not implemented yet int BMBVH_VertVisible(BMBVHTree *tree, BMEdge *e, RegionView3D *r3d) { diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 26a67c0504c..dd10cdea7ef 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -67,13 +67,15 @@ typedef struct Mesh { struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ struct Key *key; struct Material **mat; - + +/* BMESH ONLY */ /*new face structures*/ struct MPoly *mpoly; struct MTexPoly *mtpoly; struct MLoop *mloop; struct MLoopUV *mloopuv; struct MLoopCol *mloopcol; +/* END BMESH ONLY */ /*mface stores the tesselation (triangulation) of the mesh, real faces are now stored in nface.*/ @@ -83,7 +85,7 @@ typedef struct Mesh { struct MVert *mvert; /* array of verts */ struct MEdge *medge; /* array of edges */ struct MDeformVert *dvert; /* deformgroup vertices */ - + /* array of colors for the tesselated faces, must be number of tesselated faces * 4 in length */ struct MCol *mcol; @@ -93,10 +95,18 @@ typedef struct Mesh { struct BMEditMesh *edit_btmesh; /* not saved in file! */ - struct CustomData vdata, edata, fdata, pdata, ldata; + struct CustomData vdata, edata, fdata; + +/* BMESH ONLY */ + struct CustomData pdata, ldata; +/* END BMESH ONLY */ + + int totvert, totedge, totface, totselect; + +/* BMESH ONLY */ + int totpoly, totloop; +/* END BMESH ONLY */ - int totvert, totedge, totface, totpoly, totloop, totselect; - /* the last selected vertex/edge/face are used for the active face however * this means the active face must always be selected, this is to keep track * of the last selected face and is similar to the old active face flag where diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index e528bb52bc9..2ab876b2165 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1973,7 +1973,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op) else fileflags &= ~G_FILE_COMPRESS; if(RNA_boolean_get(op->ptr, "relative_remap")) fileflags |= G_FILE_RELATIVE_REMAP; else fileflags &= ~G_FILE_RELATIVE_REMAP; -#ifdef USE_MESH_FORWARDS_COMAT +#ifdef USE_BMESH_SAVE_AS_COMPAT if(RNA_boolean_get(op->ptr, "use_mesh_compat")) fileflags |= G_FILE_MESH_COMPAT; else fileflags &= ~G_FILE_MESH_COMPAT; #endif |