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

remove function for testing selection (was only used in a few places)

Browse Source
This commit is contained in:
Campbell Barton
2012-02-17 21:49:24 +00:00
parent 3e78832dea
commit a677e016d6
5 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/bmesh_marking.h
View File

@@ -42,10 +42,8 @@ void BM_face_hide_set(BMesh *bm, BMFace *f, int hide);
/* Selection code */
void BM_elem_select_set(struct BMesh *bm, void *element, int select);
/* I don't use this function anywhere, been using BM_elem_flag_test instead.
* Need to decide either to keep it and convert everything over, or
* chuck it.*/
int BM_elem_select_test(BMesh *bm, const void *element);
/* use BM_elem_flag_test(ele, BM_ELEM_SELECT) to test selection */
void BM_mesh_elem_flag_enable_all(BMesh *bm, const char htype, const char hflag);
void BM_mesh_elem_flag_disable_all(BMesh *bm, const char htype, const char hflag);

2
source/blender/bmesh/intern/bmesh_construct.c
View File

@@ -626,7 +626,7 @@ void BM_elem_attrs_copy(BMesh *source_mesh, BMesh *target_mesh, const void *sour
return;
/* First we copy select */
if (BM_elem_select_test(source_mesh, source)) BM_elem_select_set(target_mesh, target, TRUE);
if (BM_elem_flag_test(source, BM_ELEM_SELECT)) BM_elem_select_set(target_mesh, target, TRUE);
/* Now we copy flags */
theader->hflag = sheader->hflag;

8
source/blender/bmesh/intern/bmesh_marking.c
View File

@@ -494,14 +494,6 @@ void BM_elem_select_set(struct BMesh *bm, void *element, int select)
else if (head->htype == BM_FACE) BM_face_select_set(bm, (BMFace *)element, select);
}
int BM_elem_select_test(BMesh *UNUSED(bm), const void *element)
{
const BMHeader *head = element;
int selected = BM_elem_flag_test(head, BM_ELEM_SELECT);
BLI_assert(!selected || !BM_elem_flag_test(head, BM_ELEM_HIDDEN));
return selected;
}
/* this replaces the active flag used in uv/face mode */
void BM_active_face_set(BMesh *bm, BMFace *efa)
{

2
source/blender/editors/mesh/bmesh_tools.c
View File

@@ -3110,7 +3110,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
/* store percentage of edge cut for KNIFE_EXACT here.*/
for (be = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL); be; be = BM_iter_step(&iter)) {
if (BM_elem_select_test(bm, be)) {
if (BM_elem_flag_test(be, BM_ELEM_SELECT)) {
isect = bm_edge_seg_isect(be, curve, len, mode, gh, &isected);
if (isect != 0.0f) {

10
source/blender/editors/transform/transform_conversions.c
View File

@@ -1956,7 +1956,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
BMIter iter;
BM_ITER(efa, &iter, bm, BM_FACES_OF_VERT, eve) {
if (BM_elem_select_test(bm, efa)) {
if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
BM_face_center_mean_calc(bm, efa, cent_r);
break;
}
@@ -1969,7 +1969,7 @@ static void get_edge_center(float cent_r[3], BMesh *bm, BMVert *eve)
BMIter iter;
BM_ITER(eed, &iter, bm, BM_EDGES_OF_VERT, eve) {
if (BM_elem_select_test(bm, eed)) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
mid_v3_v3v3(cent_r, eed->v1->co, eed->v2->co);
break;
}
@@ -2049,7 +2049,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
// transform now requires awareness for select mode, so we tag the f1 flags in verts
if(selectmode & SCE_SELECT_VERTEX) {
BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
if (BM_elem_select_test(bm, eve)) {
if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
BM_elem_flag_enable(eve, BM_ELEM_TAG);
}
else {
@@ -2065,7 +2065,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
eed = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL);
for( ; eed; eed=BM_iter_step(&iter)) {
if (BM_elem_select_test(bm, eed)) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
BM_elem_flag_enable(eed->v1, BM_ELEM_TAG);
BM_elem_flag_enable(eed->v2, BM_ELEM_TAG);
}
@@ -2078,7 +2078,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
efa = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL);
for( ; efa; efa=BM_iter_step(&iter)) {
if (BM_elem_select_test(bm, efa)) {
if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
BMIter liter;
BMLoop *l;