Revision: 48340
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48340
Author: psy-fi
Date: 2012-06-27 17:08:12 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Fix for #31581, UVs shrink on edge slide.
Issue is that all loops of a face adjacent to the sliding verts were
getting project-corrected. Introduced a test to only project the
affected loops.
The projection code introduces a small offset to the boundaries so that
any boundary tests can work as expected, but this leads to shrinking of
the barycentric coordinates of the projection, causing a shrink of the
uvs in turn. This even affects the uvs that -should- be affected though
the unfixed behavior works strangely in a correctish way (my guess is
because the projection uses the same face as the opposite sliding loop).
I fixed the behaviour by taking the mean value of the uvs. This won't
support seams but current code doesn't either. Also, all CustomData to
exhibit this unfixed behaviour. I only fixed the uv case, other data
(Vcolors, etc) will have discontinuities when edge sliding. I expect
that the CorrectUV code I am working on may address some of these
issues.
Also, added NULL checks for utility function (was intended for this bug
but wasn't needed after all)
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-06-27
16:20:27 UTC (rev 48339)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-06-27
17:08:12 UTC (rev 48340)
@@ -196,7 +196,12 @@
BMLoop *BM_vert_find_first_loop(BMVert *v)
{
- BMEdge *e = bmesh_disk_faceedge_find_first(v->e, v);
+ BMEdge *e;
+
+ if(!v || !v->e)
+ return NULL;
+
+ e = bmesh_disk_faceedge_find_first(v->e, v);
return bmesh_radial_faceloop_find_first(e->l, v);
}
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-06-27
16:20:27 UTC (rev 48339)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-06-27
17:08:12 UTC (rev 48340)
@@ -5004,8 +5004,11 @@
for (i = 0, sv = sld->sv; i < sld->totsv; sv++, i++) {
BMIter fiter;
BMFace *f;
+ BMIter liter_v;
+ BMLoop *l_v;
+ float uv_med[2] = {0.0, 0.0};
+ int tot_loops = 0;
-
/* 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? */
@@ -5034,6 +5037,8 @@
/* project onto copied projection face */
BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
+ /* only affected verts will get interpolated */
+ char affected = FALSE;
f_copy_flip = f_copy;
if (BM_elem_flag_test(l->e, BM_ELEM_SELECT) ||
BM_elem_flag_test(l->prev->e, BM_ELEM_SELECT)) {
@@ -5058,6 +5063,8 @@
if (!f_copy_flip) {
continue; /* shouldn't happen,
but protection */
}
+
+ affected = TRUE;
}
else {
/* the loop is attached to only one
vertex and not a selected edge,
@@ -5094,10 +5101,15 @@
f_copy_flip =
BLI_smallhash_lookup(&sld->origfaces, (uintptr_t)e_sel->l->radial_next->f);
}
}
+
+ affected = TRUE;
}
}
+ if(!affected)
+ continue;
+
/* only loop data, no vertex data since that
contains shape keys,
* and we do not want to mess up other shape
keys */
BM_loop_interp_from_face(em->bm, l,
f_copy_flip, FALSE, FALSE);
@@ -5121,8 +5133,23 @@
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 */
+ 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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
