Revision: 60954
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60954
Author: campbellbarton
Date: 2013-10-27 10:01:35 +0000 (Sun, 27 Oct 2013)
Log Message:
-----------
rename BM_vert_at_index -> BM_vert_at_index_find (since this searches the
mempool).
needed for other changes - coming.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-10-27
08:19:08 UTC (rev 60953)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-10-27
10:01:35 UTC (rev 60954)
@@ -829,17 +829,17 @@
BLI_ghash_free(fptr_map, NULL, NULL);
}
-BMVert *BM_vert_at_index(BMesh *bm, const int index)
+BMVert *BM_vert_at_index_find(BMesh *bm, const int index)
{
return BLI_mempool_findelem(bm->vpool, index);
}
-BMEdge *BM_edge_at_index(BMesh *bm, const int index)
+BMEdge *BM_edge_at_index_find(BMesh *bm, const int index)
{
return BLI_mempool_findelem(bm->epool, index);
}
-BMFace *BM_face_at_index(BMesh *bm, const int index)
+BMFace *BM_face_at_index_find(BMesh *bm, const int index)
{
return BLI_mempool_findelem(bm->fpool, index);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h 2013-10-27
08:19:08 UTC (rev 60953)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.h 2013-10-27
10:01:35 UTC (rev 60954)
@@ -49,9 +49,9 @@
void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx);
-BMVert *BM_vert_at_index(BMesh *bm, const int index);
-BMEdge *BM_edge_at_index(BMesh *bm, const int index);
-BMFace *BM_face_at_index(BMesh *bm, const int index);
+BMVert *BM_vert_at_index_find(BMesh *bm, const int index);
+BMEdge *BM_edge_at_index_find(BMesh *bm, const int index);
+BMFace *BM_face_at_index_find(BMesh *bm, const int index);
typedef struct BMAllocTemplate {
int totvert, totedge, totloop, totface;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-10-27
08:19:08 UTC (rev 60953)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-10-27
10:01:35 UTC (rev 60954)
@@ -400,7 +400,7 @@
BMVert *v0;
knife_input_ray_segment(kcd, kcd->curr.mval, 1.0f, origin,
origin_ofs);
- v0 = BM_vert_at_index(kcd->em->bm, 0);
+ v0 = BM_vert_at_index_find(kcd->em->bm, 0);
if (v0) {
closest_to_line_v3(kcd->prev.cage, v0->co, origin_ofs,
origin);
copy_v3_v3(kcd->prev.co, kcd->prev.cage); /*TODO: do we
need this? */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-10-27
08:19:08 UTC (rev 60953)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-10-27
10:01:35 UTC (rev 60954)
@@ -392,7 +392,7 @@
static bool findnearestvert__backbufIndextest(void *handle, unsigned int index)
{
BMEditMesh *em = (BMEditMesh *)handle;
- BMVert *eve = BM_vert_at_index(em->bm, index - 1);
+ BMVert *eve = BM_vert_at_index_find(em->bm, index - 1);
return !(eve && BM_elem_flag_test(eve, BM_ELEM_SELECT));
}
/**
@@ -420,7 +420,7 @@
0, NULL, NULL);
}
- eve = index ? BM_vert_at_index(vc->em->bm, index - 1) : NULL;
+ eve = index ? BM_vert_at_index_find(vc->em->bm, index - 1) :
NULL;
if (eve && distance < *r_dist) {
*r_dist = distance;
@@ -436,7 +436,7 @@
static int lastSelectedIndex = 0;
static BMVert *lastSelected = NULL;
- if (lastSelected && BM_vert_at_index(vc->em->bm,
lastSelectedIndex) != lastSelected) {
+ if (lastSelected && BM_vert_at_index_find(vc->em->bm,
lastSelectedIndex) != lastSelected) {
lastSelectedIndex = 0;
lastSelected = NULL;
}
@@ -512,7 +512,7 @@
view3d_validate_backbuf(vc);
index = view3d_sample_backbuf_rect(vc, vc->mval, 50,
bm_solidoffs, bm_wireoffs, &distance, 0, NULL, NULL);
- eed = index ? BM_edge_at_index(vc->em->bm, index - 1) : NULL;
+ eed = index ? BM_edge_at_index_find(vc->em->bm, index - 1) :
NULL;
if (eed && distance < *r_dist) {
*r_dist = distance;
@@ -585,7 +585,7 @@
view3d_validate_backbuf(vc);
index = view3d_sample_backbuf(vc, vc->mval[0], vc->mval[1]);
- efa = index ? BM_face_at_index(vc->em->bm, index - 1) : NULL;
+ efa = index ? BM_face_at_index_find(vc->em->bm, index - 1) :
NULL;
if (efa) {
struct { float mval_fl[2]; float dist; BMFace *toFace;
} data;
@@ -612,7 +612,7 @@
static int lastSelectedIndex = 0;
static BMFace *lastSelected = NULL;
- if (lastSelected && BM_face_at_index(vc->em->bm,
lastSelectedIndex) != lastSelected) {
+ if (lastSelected && BM_face_at_index_find(vc->em->bm,
lastSelectedIndex) != lastSelected) {
lastSelectedIndex = 0;
lastSelected = NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
