remove unused vars, comment some which look like they could be useful still. have...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 9 Jan 2011 01:17:56 +0000 (01:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 9 Jan 2011 01:17:56 +0000 (01:17 +0000)
19 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/softbody.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/view2d.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_ui_api.c

index cdf2991..bee0b47 100644 (file)
@@ -1284,7 +1284,7 @@ static void *emDM_getFaceDataArray(DerivedMesh *dm, int type)
        EditFace *efa;
        char *data, *emdata;
        void *datalayer;
-       int index, offset, size;
+       int index, size;
 
        datalayer = DM_get_face_data_layer(dm, type);
        if(datalayer)
@@ -1296,7 +1296,7 @@ static void *emDM_getFaceDataArray(DerivedMesh *dm, int type)
                index = CustomData_get_layer_index(&em->fdata, type);
 
                if(index != -1) {
-                       offset = em->fdata.layers[index].offset;
+                       /* int offset = em->fdata.layers[index].offset; */ /* UNUSED */
                        size = CustomData_sizeof(type);
 
                        DM_add_face_layer(dm, type, CD_CALLOC, NULL);
index cc54468..39cb134 100644 (file)
@@ -164,7 +164,6 @@ static BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float eps
        BVHTree *bvhtree;
        Cloth *cloth;
        ClothVertex *verts;
-       MFace *mfaces;
        float co[12];
 
        if(!clmd)
@@ -176,7 +175,6 @@ static BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float eps
                return NULL;
        
        verts = cloth->verts;
-       mfaces = cloth->mfaces;
        
        // in the moment, return zero if no faces there
        if(!cloth->numverts)
index 6814f28..e38f1bb 100644 (file)
@@ -2453,7 +2453,8 @@ static void softbody_calc_forcesEx(Scene *scene, Object *ob, float forcetime, fl
        SoftBody *sb= ob->soft; /* is supposed to be there */
        BodyPoint *bproot;
        ListBase *do_effector = NULL;
-       float iks, gravity;
+       float gravity;
+       /* float iks; */
        float fieldfactor = -1.0f, windfactor  = 0.25;
        int   do_deflector,do_selfcollision,do_springcollision,do_aero;
 
@@ -2465,7 +2466,7 @@ static void softbody_calc_forcesEx(Scene *scene, Object *ob, float forcetime, fl
        do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL);
        do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
 
-       iks  = 1.0f/(1.0f-sb->inspring)-1.0f ;/* inner spring constants function */
+       /* iks  = 1.0f/(1.0f-sb->inspring)-1.0f; */ /* inner spring constants function */ /* UNUSED */
        bproot= sb->bpoint; /* need this for proper spring addressing */
 
        if (do_springcollision || do_aero)
index b39af6c..c0600ce 100644 (file)
@@ -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];
index 0dd135c..0f1e44a 100644 (file)
@@ -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) {
index c97e5d9..ae414c6 100644 (file)
@@ -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;
        }
        
index 1f6fa9b..4f4bf15 100644 (file)
@@ -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
index 17b5394..dc550d8 100644 (file)
@@ -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;
index c7b60f5..b0634ff 100644 (file)
@@ -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);
index 1e84bda..a7e16d0 100644 (file)
@@ -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);
index 2445191..1d10708 100644 (file)
@@ -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;
        
index 9ae9eac..47dff6f 100644 (file)
@@ -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) {
index 6c321ae..318c64f 100644 (file)
@@ -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++) {
index 445b126..53a4981 100644 (file)
@@ -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);
index 6d9c2ec..1e5024b 100644 (file)
@@ -1499,6 +1499,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
        PropertyType type;
        const char *funcname, *valstr;
        const char *ptrstr;
+       const short has_data= (dfunc->cont.properties.first != NULL);
        int flag, pout, cptr, first;
 
        srna= dsrna->srna;
@@ -1552,10 +1553,12 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                fprintf(f, "\t%s%s %s%s;\n", rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop), ptrstr, dparm->prop->identifier);
        }
 
-       fprintf(f, "\tchar *_data");
-       if(func->c_ret) fprintf(f, ", *_retdata");
-       fprintf(f, ";\n");
-       fprintf(f, "\t\n");
+       if(has_data) {
+               fprintf(f, "\tchar *_data");
+               if(func->c_ret) fprintf(f, ", *_retdata");
+               fprintf(f, ";\n");
+               fprintf(f, "\t\n");
+       }
 
        /* assign self */
        if(func->flag & FUNC_USE_SELF_ID) {
@@ -1567,7 +1570,9 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
                else fprintf(f, "\t_self= (struct %s *)_ptr->data;\n", srna->identifier);
        }
 
-       fprintf(f, "\t_data= (char *)_parms->data;\n");
+       if(has_data) {
+               fprintf(f, "\t_data= (char *)_parms->data;\n");
+       }
 
        dparm= dfunc->cont.properties.first;
        for(; dparm; dparm= dparm->next) {
index ee1ae02..d509efb 100644 (file)
@@ -4207,8 +4207,6 @@ void RNA_parameter_list_begin(ParameterList *parms, ParameterIterator *iter)
 
 void RNA_parameter_list_next(ParameterIterator *iter)
 {
-       PropertyType ptype;
-
        iter->offset+= iter->size;
        iter->parm= iter->parm->next;
        iter->valid= iter->parm != NULL;
@@ -4216,7 +4214,6 @@ void RNA_parameter_list_next(ParameterIterator *iter)
        if(iter->valid) {
                iter->size= rna_parameter_size_alloc(iter->parm);
                iter->data= (((char*)iter->parms->data)+iter->offset);
-               ptype= RNA_property_type(iter->parm);
        }
 }
 
index e71454e..96ec09f 100644 (file)
@@ -1335,9 +1335,9 @@ static void rna_def_fcurve_keyframe_points(BlenderRNA *brna, PropertyRNA *cprop)
        parm= RNA_def_float(func, "value", 0.0f, -FLT_MAX, FLT_MAX, "", "Y Value of this keyframe point", -FLT_MAX, FLT_MAX);
        RNA_def_property_flag(parm, PROP_REQUIRED);
        /* optional */
-       parm= RNA_def_boolean(func, "replace", 0, "Replace", "Don't add any new keyframes, but just replace existing ones");
-       parm= RNA_def_boolean(func, "needed", 0, "Needed", "Only adds keyframes that are needed");
-       parm= RNA_def_boolean(func, "fast", 0, "Fast", "Fast keyframe insertion to avoid recalculating the curve each time");
+       RNA_def_boolean(func, "replace", 0, "Replace", "Don't add any new keyframes, but just replace existing ones");
+       RNA_def_boolean(func, "needed", 0, "Needed", "Only adds keyframes that are needed");
+       RNA_def_boolean(func, "fast", 0, "Fast", "Fast keyframe insertion to avoid recalculating the curve each time");
 
        parm= RNA_def_pointer(func, "keyframe", "Keyframe", "", "Newly created keyframe");
        RNA_def_function_return(func, parm);
index 26136ee..fbbc88c 100644 (file)
@@ -1727,7 +1727,7 @@ static void rna_def_vertex_colors(BlenderRNA *brna, PropertyRNA *cprop)
        func= RNA_def_function(srna, "new", "rna_Mesh_vertex_color_new");
        RNA_def_function_flag(func, FUNC_USE_CONTEXT);
        RNA_def_function_ui_description(func, "Add a vertex color layer to Mesh.");
-       parm= RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name.");
+       RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name.");
        parm= RNA_def_pointer(func, "layer", "MeshColorLayer", "", "The newly created layer.");
        RNA_def_function_return(func, parm);
        
@@ -1768,7 +1768,7 @@ static void rna_def_uv_textures(BlenderRNA *brna, PropertyRNA *cprop)
        func= RNA_def_function(srna, "new", "rna_Mesh_uv_texture_new");
        RNA_def_function_flag(func, FUNC_USE_CONTEXT);
        RNA_def_function_ui_description(func, "Add a UV texture layer to Mesh.");
-       parm= RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name.");
+       RNA_def_string(func, "name", "UVTex", 0, "", "UV Texture name.");
        parm= RNA_def_pointer(func, "layer", "MeshTextureFaceLayer", "", "The newly created layer.");
        RNA_def_function_return(func, parm);
 
index 378d645..ee6715b 100644 (file)
@@ -398,9 +398,9 @@ void RNA_api_ui_layout(StructRNA *srna)
        RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR|PROP_NEVER_NULL);
        parm= RNA_def_string(func, "active_property", "", 0, "", "Identifier of property in data, for the active element.");
        RNA_def_property_flag(parm, PROP_REQUIRED);
-       parm= RNA_def_int(func, "rows", 5, 0, INT_MAX, "", "Number of rows to display.", 0, INT_MAX);
-       parm= RNA_def_int(func, "maxrows", 5, 0, INT_MAX, "", "Maximum number of rows to display.", 0, INT_MAX);
-       parm= RNA_def_enum(func, "type", list_type_items, 0, "Type", "Type of list to use.");
+       RNA_def_int(func, "rows", 5, 0, INT_MAX, "", "Number of rows to display.", 0, INT_MAX);
+       RNA_def_int(func, "maxrows", 5, 0, INT_MAX, "", "Maximum number of rows to display.", 0, INT_MAX);
+       RNA_def_enum(func, "type", list_type_items, 0, "Type", "Type of list to use.");
 
        func= RNA_def_function(srna, "template_running_jobs", "uiTemplateRunningJobs");
        RNA_def_function_flag(func, FUNC_USE_CONTEXT);