diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-09 04:17:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-09 04:17:56 +0300 |
commit | 70a828d5a5d0bd49765b281c01ca27cf188e3fca (patch) | |
tree | 634464a911d68b21d6906ccc4d34b30f51c0125f /source/blender/editors | |
parent | c0bae16dad7952eb39aaff47d7a54cc15b7f016c (diff) |
remove unused vars, comment some which look like they could be useful still. have makesrna.c omit unused _data definitions for rna funcs with no args.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 11 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 7 | ||||
-rw-r--r-- | source/blender/editors/interface/view2d.c | 3 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 22 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 7 |
11 files changed, 27 insertions, 42 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index b39af6cac73..c0600ceed1c 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -649,8 +649,8 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, MFace *mface; float solution, weight; int *vertsflipped = NULL, *mask= NULL; - int a, totface, j, bbone, firstsegment, lastsegment, thrownerror = 0; - + int a, totface, j, bbone, firstsegment, lastsegment; + *err_str= NULL; /* count triangles and create mask */ @@ -762,9 +762,8 @@ void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], int numsource, } } } - else if(!thrownerror) { + else if(*err_str == NULL) { *err_str= "Bone Heat Weighting: failed to find solution for one or more bones"; - thrownerror= 1; break; } @@ -1265,11 +1264,9 @@ static int meshdeform_inside_cage(MeshDeformBind *mdb, float *co) { MDefBoundIsect *isect; float outside[3], start[3], dir[3]; - int i, counter; + int i; for(i=1; i<=6; i++) { - counter = 0; - outside[0] = co[0] + (mdb->max[0] - mdb->min[0] + 1.0f)*MESHDEFORM_OFFSET[i][0]; outside[1] = co[1] + (mdb->max[1] - mdb->min[1] + 1.0f)*MESHDEFORM_OFFSET[i][1]; outside[2] = co[2] + (mdb->max[2] - mdb->min[2] + 1.0f)*MESHDEFORM_OFFSET[i][2]; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 0dd135c9ba4..0f1e44aff1d 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3757,13 +3757,13 @@ static int ui_numedit_but_VECTORSCOPE(uiBut *but, uiHandleButtonData *data, int Scopes *scopes = (Scopes *)but->poin; rcti rect; int changed= 1; - float dx, dy; + /* float dx, dy; */ rect.xmin= but->x1; rect.xmax= but->x2; rect.ymin= but->y1; rect.ymax= but->y2; - dx = mx - data->draglastx; - dy = my - data->draglasty; + /* dx = mx - data->draglastx; */ + /* dy = my - data->draglasty; */ if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) { /* resize vectorscope widget itself */ @@ -5679,7 +5679,6 @@ int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle *menu, (event->ctrl == FALSE) && (event->oskey == FALSE) ) { - count= 0; for(but= block->buttons.first; but; but= but->next) { if(but->menu_key==event->type) { diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index c97e5d9baea..ae414c6e557 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1110,7 +1110,6 @@ View2DGrid *UI_view2d_grid_calc(Scene *scene, View2D *v2d, short xunits, short x View2DGrid *grid; float space, pixels, seconddiv; - int secondgrid; /* check that there are at least some workable args */ if (ELEM(V2D_ARG_DUMMY, xunits, xclamp) && ELEM(V2D_ARG_DUMMY, yunits, yclamp)) @@ -1121,11 +1120,9 @@ View2DGrid *UI_view2d_grid_calc(Scene *scene, View2D *v2d, short xunits, short x /* rule: gridstep is minimal GRIDSTEP pixels */ if (xunits == V2D_UNIT_SECONDS) { - secondgrid= 1; seconddiv= (float)(0.01 * FPS); } else { - secondgrid= 0; seconddiv= 1.0f; } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 1f6fa9b0fb6..4f4bf159699 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -1198,13 +1198,13 @@ static void delete_mesh(EditMesh *em, wmOperator *op, int event) EditVert *eve,*nextve; EditEdge *eed,*nexted; int count; - const char *str="Erase"; + /* const char *str="Erase"; */ if(event<1) return; if(event==10 ) { - str= "Erase Vertices"; + /* str= "Erase Vertices"; */ erase_edges(em, &em->edges); erase_faces(em, &em->faces); erase_vertices(em, &em->verts); @@ -1213,10 +1213,10 @@ static void delete_mesh(EditMesh *em, wmOperator *op, int event) if(!EdgeLoopDelete(em, op)) return; - str= "Erase Edge Loop"; + /* str= "Erase Edge Loop"; */ } else if(event==4) { - str= "Erase Edges & Faces"; + /* str= "Erase Edges & Faces"; */ efa= em->faces.first; while(efa) { nextvl= efa->next; @@ -1258,7 +1258,7 @@ static void delete_mesh(EditMesh *em, wmOperator *op, int event) } } else if(event==1) { - str= "Erase Edges"; + /* str= "Erase Edges"; */ // faces first efa= em->faces.first; while(efa) { @@ -1303,18 +1303,18 @@ static void delete_mesh(EditMesh *em, wmOperator *op, int event) } else if(event==2) { - str="Erase Faces"; + /* str="Erase Faces"; */ delfaceflag(em, SELECT); } else if(event==3) { - str= "Erase All"; + /* str= "Erase All"; */ if(em->verts.first) free_vertlist(em, &em->verts); if(em->edges.first) free_edgelist(em, &em->edges); if(em->faces.first) free_facelist(em, &em->faces); if(em->selected.first) BLI_freelistN(&(em->selected)); } else if(event==5) { - str= "Erase Only Faces"; + /* str= "Erase Only Faces"; */ efa= em->faces.first; while(efa) { nextvl= efa->next; @@ -1685,7 +1685,7 @@ static void fill_quad_double_op(EditMesh *em, EditFace *efa, struct GHash *gh, i EditEdge *cedge[2]={NULL, NULL}; EditVert *v[4], **verts[2]; EditFace *hold; - short start=0, end, left, right, vertsize,i; + short start=0, /*end,*/ left, /* right,*/ vertsize,i; v[0] = efa->v1; v[1] = efa->v2; @@ -1706,9 +1706,9 @@ static void fill_quad_double_op(EditMesh *em, EditFace *efa, struct GHash *gh, i // the array to the correct direction if(verts[0][0] != v[start]) {flipvertarray(verts[0],numcuts+2);} - end = (start+1)%4; + /* end = (start+1)%4; */ /* UNUSED */ left = (start+2)%4; - right = (start+3)%4; + /* right = (start+3)%4; */ /* UNUSED */ if(verts[1][0] != v[left]) {flipvertarray(verts[1],numcuts+2);} /* We should have something like this now diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 17b53946569..dc550d84e4d 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -261,7 +261,6 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event) { ARegion *ar= CTX_wm_region(C); SpaceFile *sfile= CTX_wm_space_file(C); - short val; rcti rect; int extend = RNA_boolean_get(op->ptr, "extend"); int fill = RNA_boolean_get(op->ptr, "fill"); @@ -271,7 +270,6 @@ static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event) rect.xmin = rect.xmax = event->x - ar->winrct.xmin; rect.ymin = rect.ymax = event->y - ar->winrct.ymin; - val = event->val; if(!BLI_in_rcti(&ar->v2d.mask, rect.xmin, rect.ymin)) return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index c7b60f5abd9..b0634ff25c7 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -5039,9 +5039,9 @@ void logic_buttons(bContext *C, ARegion *ar) else { set_col_actuator(act->type, 1); glRecti((short)(xco+22), yco, (short)(xco+width-22),(short)(yco+19)); - but= uiDefBut(block, LABEL, 0, actuator_name(act->type), (short)(xco+22), yco, 90, UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator type"); + /* but= */ uiDefBut(block, LABEL, 0, actuator_name(act->type), (short)(xco+22), yco, 90, UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator type"); // uiButSetFunc(but, old_sca_move_actuator, act, NULL); - but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-(pin?156:134)), UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator name"); + /* but= */ uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-(pin?156:134)), UI_UNIT_Y, act, 0, 0, 0, 0, "Actuator name"); // uiButSetFunc(but, old_sca_move_actuator, act, NULL); uiBlockBeginAlign(block); diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 1e84bda2a29..a7e16d056d1 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -212,7 +212,7 @@ static int nla_strip_actclip_panel_poll(const bContext *C, PanelType *UNUSED(pt) static void nla_panel_animdata (const bContext *C, Panel *pa) { PointerRNA adt_ptr; - AnimData *adt; + /* AnimData *adt; */ uiLayout *layout= pa->layout; uiLayout *row; uiBlock *block; @@ -220,7 +220,8 @@ static void nla_panel_animdata (const bContext *C, Panel *pa) /* check context and also validity of pointer */ if (!nla_panel_context(C, &adt_ptr, NULL, NULL)) return; - adt= adt_ptr.data; + + /* adt= adt_ptr.data; */ block= uiLayoutGetBlock(layout); uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL); diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 24451912f89..1d10708547b 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -188,7 +188,7 @@ static void check_persistant(SpaceOops *soops, TreeElement *te, ID *id, short ty /* case 1; no TreeStore */ if(soops->treestore==NULL) { - ts= soops->treestore= MEM_callocN(sizeof(TreeStore), "treestore"); + soops->treestore= MEM_callocN(sizeof(TreeStore), "treestore"); } ts= soops->treestore; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 9ae9eac7602..47dff6face4 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1781,7 +1781,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); Editing *ed= seq_give_editing(scene, FALSE); - Sequence *seq, *seq_new, *seq_next_iter; + Sequence *seq, *seq_new; Strip *strip_new; StripElem *se, *se_new; int start_ofs, cfra, frame_end; @@ -1793,7 +1793,6 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) if((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) { /* remove seq so overlap tests dont conflict, see seq_free_sequence below for the real free'ing */ - seq_next_iter = seq->next; BLI_remlink(ed->seqbasep, seq); /* if(seq->ipo) seq->ipo->id.us--; */ /* XXX, remove fcurve and assign to split image strips */ @@ -1818,7 +1817,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) /* new stripdata */ strip_new->stripdata= se_new= MEM_callocN(sizeof(StripElem)*1, "stripelem"); - strncpy(se_new->name, se->name, FILE_MAXFILE-1); + BLI_strncpy(se_new->name, se->name, sizeof(se_new->name)); calc_sequence(scene, seq_new); if(step > 1) { diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 6c321ae4a1c..318c64f87a7 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -602,7 +602,6 @@ void wrap_offset_in_line(SpaceText *st, ARegion *ar, TextLine *linein, int cursi start= 0; end= max; chop= 1; - chars= 0; *offc= 0; for(i=0, j=0; linein->line[j]!='\0'; j++) { diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 445b126cb2f..53a4981661f 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -282,12 +282,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float if(block) { // buttons uiBut *but; - int but_y; - if((ob->parent) && (ob->partype == PARBONE)) but_y = 135; - else but_y = 150; - - - + memcpy(tfp->ve_median, median, sizeof(tfp->ve_median)); uiBlockBeginAlign(block); |