diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-10 09:35:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-10 09:35:10 +0400 |
| commit | 0ce1be552e8d240f8fd17d9b21e045045c85cc5b (patch) | |
| tree | a74549557aeb5ca2d24f773e013f524ed871d9f2 /source/blender/editors/transform/transform_conversions.c | |
| parent | 70833509132b86198742ee1eec017e7869c328ee (diff) | |
transforming verts was getting the bevel weight for each vertex even if bevel-weight wasnt being transformed.
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index cc5a56a34f8..d38bdb178fb 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1915,8 +1915,8 @@ static void VertsToTransData(TransInfo *t, TransData *td, TransDataExtension *tx td->val = NULL; td->extra = NULL; if (t->mode == TFM_BWEIGHT) { - td->val = bweight; - td->ival = bweight ? *(bweight) : 1.0f; + td->val = bweight; + td->ival = *bweight; } else if (t->mode == TFM_SKIN_RESIZE) { MVertSkin *vs = CustomData_bmesh_get(&em->bm->vdata, @@ -1952,6 +1952,7 @@ static void createTransEditVerts(TransInfo *t) int mirror = 0; char *selstate = NULL; short selectmode = ts->selectmode; + int cd_vert_bweight_offset = -1; if (t->flag & T_MIRROR) { EDBM_verts_mirror_cache_begin(em, TRUE); @@ -2033,6 +2034,10 @@ static void createTransEditVerts(TransInfo *t) } } + if (t->mode == TFM_BWEIGHT) { + BM_mesh_cd_flag_ensure(bm, BKE_mesh_from_object(t->obedit), ME_CDFLAG_VERT_BWEIGHT); + cd_vert_bweight_offset = CustomData_get_offset(&bm->vdata, CD_BWEIGHT); + } if (propmode) { t->total = count; @@ -2099,11 +2104,10 @@ static void createTransEditVerts(TransInfo *t) } } - eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); - for (a = 0; eve; eve = BM_iter_step(&iter), a++) { + BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, a) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { if (propmode || selstate[a]) { - float *bweight = CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_BWEIGHT); + float *bweight = (cd_vert_bweight_offset != -1) ? BM_ELEM_CD_GET_VOID_P(eve, cd_vert_bweight_offset) : NULL; VertsToTransData(t, tob, tx, em, eve, bweight); if (tx) |