[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45906] trunk/blender/source/blender: - remove unneeded len_v3v3 in bevel code

Campbell Barton ideasman42 at gmail.com
Tue Apr 24 06:44:51 CEST 2012


Revision: 45906
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45906
Author:   campbellbarton
Date:     2012-04-24 04:44:51 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
- remove unneeded len_v3v3 in bevel code
- remove dead assignments from vgroup-blend

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/tools/BME_bevel.c
    trunk/blender/source/blender/editors/object/object_vgroup.c

Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-04-24 04:38:43 UTC (rev 45905)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-04-24 04:44:51 UTC (rev 45906)
@@ -360,8 +360,7 @@
 
 	is_edge = BME_bevel_get_vec(vec1, v, v1, td); /* get the vector we will be projecting onto */
 	BME_bevel_get_vec(vec2, v, v2, td); /* get the vector we will be projecting parallel to */
-	len = len_v3(vec1);
-	normalize_v3(vec1);
+	len = normalize_v3(vec1);
 
 	vtd = BME_get_transdata(td, sv);
 	vtd1 = BME_get_transdata(td, v);
@@ -399,8 +398,7 @@
 	}
 	madd_v3_v3v3fl(sv->co, v->co, vec1, dis);
 	sub_v3_v3v3(vec1, sv->co, vtd1->org);
-	dis = len_v3(vec1);
-	normalize_v3(vec1);
+	dis = normalize_v3(vec1);
 	BME_assign_transdata(td, bm, sv, vtd1->org, vtd1->org, vec1, sv->co, dis, scale, maxfactor, vtd->max);
 
 	return sv;

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2012-04-24 04:38:43 UTC (rev 45905)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2012-04-24 04:44:51 UTC (rev 45906)
@@ -1264,7 +1264,6 @@
 
 	if (BLI_findlink(&ob->defbase, def_nr)) {
 		const float ifac = 1.0f - fac;
-		int i1, i2;
 
 		BMEditMesh *em = BMEdit_FromObject(ob);
 		BMesh *bm = em ? em->bm : NULL;
@@ -1301,14 +1300,15 @@
 				sel2 = BM_elem_flag_test(eed->v2, BM_ELEM_SELECT);
 
 				if (sel1 != sel2) {
+					int i1 /* , i2 */;
 					/* i1 is always the selected one */
 					if (sel1) {
 						i1= BM_elem_index_get(eed->v1);
-						i2= BM_elem_index_get(eed->v2);
+						/* i2= BM_elem_index_get(eed->v2); */ /* UNUSED */
 						eve= eed->v2;
 					}
 					else {
-						i2= BM_elem_index_get(eed->v1);
+						/* i2= BM_elem_index_get(eed->v1); */ /* UNUSED */
 						i1= BM_elem_index_get(eed->v2);
 						eve= eed->v1;
 					}
@@ -1342,6 +1342,7 @@
 				sel2 = me->mvert[ed->v2].flag & SELECT;
 
 				if (sel1 != sel2) {
+					int i1, i2;
 					/* i1 is always the selected one */
 					if (sel1) {
 						i1 = ed->v1;




More information about the Bf-blender-cvs mailing list