diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2012-06-28 19:09:24 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2012-06-28 19:09:24 +0400 |
commit | 6b8986af43eecc47b79ed24b16f3c3f482284167 (patch) | |
tree | ce1a6becf28256ad0a11d3ac251392253da56afe /source/blender/editors | |
parent | 1ba5db129b27cec4cf7c9ceca549e1dd0746d001 (diff) |
revert part of 48340, it causes uvs across islands to stitch in a different way (?) than before
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/transform/transform.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 928b9c2fc62..a00376974a5 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5012,9 +5012,7 @@ void projectSVData(TransInfo *t, int final) for (i = 0, sv = sld->sv; i < sld->totsv; sv++, i++) { BMIter fiter; BMFace *f; - BMIter liter_v; - BMLoop *l_v; - + /* BMESH_TODO, this interpolates between vertex/loops which are not moved * (are only apart of a face attached to a slide vert), couldn't we iterate BM_LOOPS_OF_VERT * here and only interpolate those? */ @@ -5139,26 +5137,6 @@ void projectSVData(TransInfo *t, int final) BM_elem_hide_set(em->bm, f, is_hide); } } - - /* make sure every loop of the vertex has identical uv data. Use this temporarily to - * fix #31581 until proper data correction/ support for islands is done */ - /* XXX - this only does the active UV layer which is not really good, should do _all_ uv's - campbell */ - if (has_uv) { - float uv_med[2] = {0.0, 0.0}; - int tot_loops = 0; - BM_ITER_ELEM (l_v, &liter_v, sv->v, BM_LOOPS_OF_VERT) { - MLoopUV *uv = CustomData_bmesh_get(&em->bm->ldata, l_v->head.data, CD_MLOOPUV); - add_v2_v2(uv_med, uv->uv); - tot_loops++; - } - - mul_v2_fl(uv_med, 1.0/tot_loops); - - BM_ITER_ELEM (l_v, &liter_v, sv->v, BM_LOOPS_OF_VERT) { - MLoopUV *uv = CustomData_bmesh_get(&em->bm->ldata, l_v->head.data, CD_MLOOPUV); - copy_v2_v2(uv->uv, uv_med); - } - } } BLI_smallhash_release(&visit); |