Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-04-24 08:44:51 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-24 08:44:51 +0400
commit077cbaddf00015d44fba7d52f194406d8891724b (patch)
tree440029bb613d7c9dde0a1dfe80b8254f32ebca5c /source/blender/editors/object/object_vgroup.c
parent4ff038c4119327f3b0c472b71356d5e0cf2e0ed6 (diff)
- remove unneeded len_v3v3 in bevel code
- remove dead assignments from vgroup-blend
Diffstat (limited to 'source/blender/editors/object/object_vgroup.c')
-rw-r--r--source/blender/editors/object/object_vgroup.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index eb380700a61..b5c34f1c750 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1264,7 +1264,6 @@ static void vgroup_blend(Object *ob, const float fac)
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 @@ static void vgroup_blend(Object *ob, const float fac)
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 @@ static void vgroup_blend(Object *ob, const float fac)
sel2 = me->mvert[ed->v2].flag & SELECT;
if (sel1 != sel2) {
+ int i1, i2;
/* i1 is always the selected one */
if (sel1) {
i1 = ed->v1;