diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 07:44:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:50 +0300 |
| commit | 48b1656a6cce6fd7606a671eea9d0d17b67d7445 (patch) | |
| tree | d95ed94cf1d1934c01de44364db7d53ca2262ff3 /source/blender/editors/transform/transform_conversions.c | |
| parent | 6e4cb463c44ab57331cda7ded645b4faa573bbb3 (diff) | |
Cleanup: shadowing (editors)
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index af2ad1311e4..6a8e545ba3c 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2047,11 +2047,13 @@ static void editmesh_set_connectivity_distance(BMesh *bm, float mtx[3][3], float if (BM_elem_flag_test(e_iter, BM_ELEM_HIDDEN) == 0) { /* edge distance */ - BMVert *v_other = BM_edge_other_vert(e_iter, v); - if (bmesh_test_dist_add(v, v_other, dists, dists_prev, mtx)) { - if (BM_elem_flag_test(v_other, BM_ELEM_TAG) == 0) { - BM_elem_flag_enable(v_other, BM_ELEM_TAG); - BLI_LINKSTACK_PUSH(queue_next, v_other); + { + BMVert *v_other = BM_edge_other_vert(e_iter, v); + if (bmesh_test_dist_add(v, v_other, dists, dists_prev, mtx)) { + if (BM_elem_flag_test(v_other, BM_ELEM_TAG) == 0) { + BM_elem_flag_enable(v_other, BM_ELEM_TAG); + BLI_LINKSTACK_PUSH(queue_next, v_other); + } } } @@ -2089,10 +2091,10 @@ static void editmesh_set_connectivity_distance(BMesh *bm, float mtx[3][3], float /* clear for the next loop */ for (lnk = queue_next; lnk; lnk = lnk->next) { - BMVert *v = lnk->link; - const int i = BM_elem_index_get(v); + BMVert *v_link = lnk->link; + const int i = BM_elem_index_get(v_link); - BM_elem_flag_disable(v, BM_ELEM_TAG); + BM_elem_flag_disable(v_link, BM_ELEM_TAG); /* keep in sync, avoid having to do full memcpy each iteration */ dists_prev[i] = dists[i]; @@ -3751,16 +3753,19 @@ static void createTransActionData(bContext *C, TransInfo *t) /* loop 2: build transdata array */ for (ale = anim_data.first; ale; ale = ale->next) { - AnimData *adt; if (is_prop_edit && !ale->tag) continue; - adt = ANIM_nla_mapping_get(&ac, ale); - if (adt) - cfra = BKE_nla_tweakedit_remap(adt, (float)CFRA, NLATIME_CONVERT_UNMAP); - else - cfra = (float)CFRA; + cfra = (float)CFRA; + + { + AnimData *adt; + adt = ANIM_nla_mapping_get(&ac, ale); + if (adt) { + cfra = BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP); + } + } if (ale->type == ANIMTYPE_GPLAYER) { bGPDlayer *gpl = (bGPDlayer *)ale->data; |