[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42934] branches/bmesh/blender/source/ blender: syncing with trunk, remove unused function
Campbell Barton
ideasman42 at gmail.com
Wed Dec 28 15:22:47 CET 2011
Revision: 42934
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42934
Author: campbellbarton
Date: 2011-12-28 14:22:46 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
syncing with trunk, remove unused function
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c 2011-12-28 14:21:51 UTC (rev 42933)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c 2011-12-28 14:22:46 UTC (rev 42934)
@@ -620,50 +620,6 @@
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)
{
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h 2011-12-28 14:21:51 UTC (rev 42933)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h 2011-12-28 14:22:46 UTC (rev 42934)
@@ -67,13 +67,15 @@
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 @@
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 @@
struct BMEditMesh *edit_btmesh; /* not saved in file! */
- struct CustomData vdata, edata, fdata, pdata, ldata;
+ struct CustomData vdata, edata, fdata;
- int totvert, totedge, totface, totpoly, totloop, totselect;
-
+/* BMESH ONLY */
+ struct CustomData pdata, ldata;
+/* END BMESH ONLY */
+
+ int totvert, totedge, totface, totselect;
+
+/* BMESH ONLY */
+ int totpoly, totloop;
+/* END BMESH ONLY */
+
/* 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
Modified: branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c 2011-12-28 14:21:51 UTC (rev 42933)
+++ branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c 2011-12-28 14:22:46 UTC (rev 42934)
@@ -1973,7 +1973,7 @@
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
More information about the Bf-blender-cvs
mailing list