diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 16:18:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 16:18:12 +0400 |
commit | 769c566672aa820c40a57f77cb250885458b2e70 (patch) | |
tree | d59cf963d4ef267237a8c5a9f93706b6bb48a40f /source/blender/editors/space_view3d/view3d_buttons.c | |
parent | c8ed6f79b5a7bba56dd1eab6806c21bd606df920 (diff) |
code cleanup: remove dead code, view3d panel was building a menu string and not using it.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_buttons.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 536bccfbe7a..dab20651537 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -95,8 +95,6 @@ typedef struct { float ob_dims[3]; short link_scale; float ve_median[NBR_TRANSFORM_PROPERTIES]; - int curdef; - float *defweightp; } TransformProperties; /* Helper function to compute a median changed value, @@ -154,17 +152,14 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float #define L_WEIGHT 4 uiBlock *block = (layout) ? uiLayoutAbsoluteBlock(layout) : NULL; - MDeformVert *dvert = NULL; TransformProperties *tfp; float median[NBR_TRANSFORM_PROPERTIES], ve_median[NBR_TRANSFORM_PROPERTIES]; int tot, totedgedata, totcurvedata, totlattdata, totskinradius, totcurvebweight; bool has_meshdata = false; - char defstr[320]; PointerRNA data_ptr; fill_vn_fl(median, NBR_TRANSFORM_PROPERTIES, 0.0f); tot = totedgedata = totcurvedata = totlattdata = totskinradius = totcurvebweight = 0; - defstr[0] = '\0'; /* make sure we got storage */ if (v3d->properties_storage == NULL) @@ -175,7 +170,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float Mesh *me = ob->data; BMEditMesh *em = me->edit_btmesh; BMesh *bm = em->bm; - BMVert *eve, *evedef = NULL; + BMVert *eve; BMEdge *eed; BMIter iter; @@ -187,7 +182,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float if (bm->totvertsel) { BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { - evedef = eve; tot++; add_v3_v3(&median[LOC_X], eve->co); @@ -226,33 +220,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float totedgedata = bm->totedgesel; } - /* check for defgroups */ - if (evedef) - dvert = CustomData_bmesh_get(&bm->vdata, evedef->head.data, CD_MDEFORMVERT); - if (tot == 1 && dvert && dvert->totweight) { - bDeformGroup *dg; - int i, max = 1, init = 1; - char str[320]; - - for (i = 0; i < dvert->totweight; i++) { - dg = BLI_findlink(&ob->defbase, dvert->dw[i].def_nr); - if (dg) { - max += BLI_snprintf(str, sizeof(str), "%s %%x%d|", dg->name, dvert->dw[i].def_nr); - if (max < sizeof(str)) strcat(defstr, str); - } - - if (tfp->curdef == dvert->dw[i].def_nr) { - init = 0; - tfp->defweightp = &dvert->dw[i].weight; - } - } - - if (init) { /* needs new initialized */ - tfp->curdef = dvert->dw[0].def_nr; - tfp->defweightp = &dvert->dw[0].weight; - } - } - has_meshdata = (totedgedata || totskinradius); } else if (ob->type == OB_CURVE || ob->type == OB_SURF) { |