Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: just variable naming

Browse Source
This commit is contained in:
Campbell Barton
2013-01-29 01:02:45 +00:00
parent cf94722380
commit af70a34bfb
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/transform/transform.c
View File

@@ -4872,18 +4872,19 @@ int BoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
static BMEdge *get_other_edge(BMVert *v, BMEdge *e) static BMEdge *get_other_edge(BMVert *v, BMEdge *e)
{ {
BMIter iter; BMIter iter;
BMEdge *e2; BMEdge *e_iter;
BM_ITER_ELEM (e2, &iter, v, BM_EDGES_OF_VERT) { BM_ITER_ELEM (e_iter, &iter, v, BM_EDGES_OF_VERT) {
if (BM_elem_flag_test(e2, BM_ELEM_SELECT) && e2 != e) if (BM_elem_flag_test(e_iter, BM_ELEM_SELECT) && e_iter != e) {
return e2; return e_iter;
}
} }
return NULL; return NULL;
} }
static BMLoop *get_next_loop(BMVert *v, BMLoop *l, static BMLoop *get_next_loop(BMVert *v, BMLoop *l,
BMEdge *olde, BMEdge *nexte, float vec[3]) BMEdge *e_prev, BMEdge *e_next, float vec[3])
{ {
BMLoop *firstl; BMLoop *firstl;
float a[3] = {0.0f, 0.0f, 0.0f}, n[3] = {0.0f, 0.0f, 0.0f}; float a[3] = {0.0f, 0.0f, 0.0f}, n[3] = {0.0f, 0.0f, 0.0f};
@@ -4895,23 +4896,23 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l,
if (l->radial_next == l) if (l->radial_next == l)
return NULL; return NULL;
if (l->e == nexte) { if (l->e == e_next) {
if (i) { if (i) {
mul_v3_fl(a, 1.0f / (float)i); mul_v3_fl(a, 1.0f / (float)i);
} }
else { else {
float f1[3], f2[3], f3[3]; float f1[3], f2[3], f3[3];
sub_v3_v3v3(f1, BM_edge_other_vert(olde, v)->co, v->co); sub_v3_v3v3(f1, BM_edge_other_vert(e_prev, v)->co, v->co);
sub_v3_v3v3(f2, BM_edge_other_vert(nexte, v)->co, v->co); sub_v3_v3v3(f2, BM_edge_other_vert(e_next, v)->co, v->co);
cross_v3_v3v3(f3, f1, l->f->no); cross_v3_v3v3(f3, f1, l->f->no);
cross_v3_v3v3(a, f2, l->f->no); cross_v3_v3v3(a, f2, l->f->no);
mul_v3_fl(a, -1.0f); negate_v3(a);
mid_v3_v3v3(a, a, f3); mid_v3_v3v3(a, a, f3);
} }
copy_v3_v3(vec, a); copy_v3_v3(vec, a);
return l; return l;
} }
@@ -4921,10 +4922,11 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l,
i += 1; i += 1;
} }
if (BM_face_other_edge_loop(l->f, l->e, v)->e == nexte) { if (BM_face_other_edge_loop(l->f, l->e, v)->e == e_next) {
if (i) if (i) {
mul_v3_fl(a, 1.0f / (float)i); mul_v3_fl(a, 1.0f / (float)i);
}
copy_v3_v3(vec, a); copy_v3_v3(vec, a);
return BM_face_other_edge_loop(l->f, l->e, v); return BM_face_other_edge_loop(l->f, l->e, v);
} }