[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48377] trunk/blender/source/blender/ editors/transform/transform.c: revert part of 48340, it causes uvs across islands to stitch in a different way (?) than before

Antony Riakiotakis kalast at gmail.com
Thu Jun 28 17:09:41 CEST 2012


Revision: 48377
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48377
Author:   psy-fi
Date:     2012-06-28 15:09:24 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
revert part of 48340, it causes uvs across islands to stitch in a different way (?) than before

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2012-06-28 14:19:53 UTC (rev 48376)
+++ trunk/blender/source/blender/editors/transform/transform.c	2012-06-28 15:09:24 UTC (rev 48377)
@@ -5012,9 +5012,7 @@
 	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 @@
 				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);




More information about the Bf-blender-cvs mailing list