[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43906] branches/bmesh/blender/source/ blender: Code Cleanup: use vector functions for copying / adding UV's

[Campbell Barton]

Revision: 43906
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43906
Author:   campbellbarton
Date:     2012-02-05 13:25:42 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Code Cleanup: use vector functions for copying / adding UV's

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-02-05 13:04:13 UTC (rev 43905)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-02-05 13:25:42 UTC (rev 43906)
@@ -1959,8 +1959,7 @@
 		for (j=0; j<3; j++) {
 			l = l3[j];
 			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->head.data, CD_MLOOPUV, i);
-			texface->uv[j][0] = mloopuv->uv[0];
-			texface->uv[j][1] = mloopuv->uv[1];
+			copy_v2_v2(texface->uv[j], mloopuv->uv);
 		}
 	}
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2012-02-05 13:04:13 UTC (rev 43905)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2012-02-05 13:25:42 UTC (rev 43906)
@@ -1851,12 +1851,12 @@
 		texpoly->unwrap = texface->unwrap;
 	
 		mloopuv = CustomData_get_n(&me->ldata, CD_MLOOPUV, loopstart, i);
-		mloopuv->uv[0] = texface->uv[0][0]; mloopuv->uv[1] = texface->uv[0][1]; mloopuv++;
-		mloopuv->uv[0] = texface->uv[1][0]; mloopuv->uv[1] = texface->uv[1][1]; mloopuv++;
-		mloopuv->uv[0] = texface->uv[2][0]; mloopuv->uv[1] = texface->uv[2][1]; mloopuv++;
+		copy_v2_v2(mloopuv->uv, texface->uv[0]); mloopuv++;
+		copy_v2_v2(mloopuv->uv, texface->uv[1]); mloopuv++;
+		copy_v2_v2(mloopuv->uv, texface->uv[2]); mloopuv++;
 
 		if (mf->v4) {
-			mloopuv->uv[0] = texface->uv[3][0]; mloopuv->uv[1] = texface->uv[3][1]; mloopuv++;
+			copy_v2_v2(mloopuv->uv, texface->uv[3]); mloopuv++;
 		}
 	}
 
@@ -2201,8 +2201,7 @@
 
 		for (j=0; j < mf_len; j++) {
 			mloopuv = CustomData_get_n(ldata, CD_MLOOPUV, lindex[j], i);
-			texface->uv[j][0] = mloopuv->uv[0];
-			texface->uv[j][1] = mloopuv->uv[1];
+			copy_v3_v3(texface->uv[j], mloopuv->uv);
 		}
 	}
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-02-05 13:04:13 UTC (rev 43905)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-02-05 13:25:42 UTC (rev 43906)
@@ -2410,8 +2410,7 @@
 
 		mloopuv = CustomData_get_n(ldata, CD_MLOOPUV, loopstart, i);
 		for (j=0; j<4; j++, mloopuv++) {
-			texface->uv[j][0] = mloopuv->uv[0];
-			texface->uv[j][1] = mloopuv->uv[1];
+			copy_v2_v2(texface->uv[j], mloopuv->uv);
 		}
 	}
 
@@ -2445,8 +2444,7 @@
 
 		lof = CustomData_get(ldata, loopstart, CD_ORIGSPACE_MLOOP);
 		for (j=0; j<4; j++, lof++) {
-			of->uv[j][0] = lof->uv[0];
-			of->uv[j][1] = lof->uv[1];
+			copy_v2_v2(of->uv[j], lof->uv);
 		}
 	}
 }

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c	2012-02-05 13:04:13 UTC (rev 43905)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c	2012-02-05 13:25:42 UTC (rev 43906)
@@ -150,8 +150,7 @@
 		j = 0;
 		BM_ITER(l, &iter, bm, BM_LOOPS_OF_FACE, f) {
 			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->head.data, CD_MLOOPUV, i);
-			texface->uv[j][0] = mloopuv->uv[0];
-			texface->uv[j][1] = mloopuv->uv[1];
+			copy_v2_v2(texface->uv[j], mloopuv->uv);
 
 			j++;
 		}

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c	2012-02-05 13:04:13 UTC (rev 43905)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c	2012-02-05 13:25:42 UTC (rev 43906)
@@ -194,8 +194,7 @@
 				BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 					luv= CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
 
-					tf_uvorig[i][0] = luv->uv[0];
-					tf_uvorig[i][1] = luv->uv[1];
+					copy_v2_v2(tf_uvorig[i], luv->uv);
 
 					i++;
 				}
@@ -245,8 +244,7 @@
 						BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
 							luv= CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
 
-							tf_uvorig[i][0] = luv->uv[0];
-							tf_uvorig[i][1] = luv->uv[1];
+							copy_v2_v2(tf_uvorig[i], luv->uv);
 
 							i++;
 						}

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-02-05 13:04:13 UTC (rev 43905)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-02-05 13:25:42 UTC (rev 43906)
@@ -512,16 +512,14 @@
 	MLoopUV *luv;
 	BMIter liter;
 
-	cent[0] = cent[1] = 0.0f;
+	zero_v2(cent);
 
 	BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
 		luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
-		cent[0] += luv->uv[0];
-		cent[1] += luv->uv[1];
+		add_v2_v2(cent, luv->uv);
 	}
 
-	cent[0] /= (float) f->len;
-	cent[1] /= (float) f->len;
+	mul_v2_fl(cent, 1.0f / (float)f->len);
 }
 
 
@@ -2951,8 +2949,7 @@
 			if (BM_GetIndex(l->v) >= 0 && 
 			    (!uvedit_uv_selected(em, scene, l))) {
 				    luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
-				    coords[BM_GetIndex(l->v)*2] += luv->uv[0];
-				    coords[BM_GetIndex(l->v)*2+1] += luv->uv[1];
+					add_v2_v2(&coords[BM_GetIndex(l->v) * 2], luv->uv);
 				    change = 1;
 			}
 		}
@@ -2978,8 +2975,7 @@
 			if (uvedit_uv_selected(em, scene, l) && BM_GetIndex(l->v) >= 0
 			    && (users = usercount[BM_GetIndex(l->v)])) {
 				luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
-				luv->uv[0] = coords[BM_GetIndex(l->v)*2];
-				luv->uv[1] = coords[BM_GetIndex(l->v)*2+1];
+				copy_v2_v2(luv->uv, &coords[BM_GetIndex(l->v) * 2]);
 			}
 		}
 	}