diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-07-16 08:45:52 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-07-16 08:45:52 +0400 |
commit | 513dcf7b46eee6ffbb47f6046c4840730e173180 (patch) | |
tree | 742ba5baa39b7b7e34f20b8af7c0ba14379f0556 /source/blender/editors | |
parent | 111be5ea2aa227cc93c9fc57750e463c55056673 (diff) |
2.5 - Silencing various compiler warnings (mingw)
Diffstat (limited to 'source/blender/editors')
18 files changed, 48 insertions, 38 deletions
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 6e62b163ca9..fc67ee34a2e 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -43,6 +43,8 @@ #include "DNA_space_types.h" #include "DNA_scene_types.h" +#include "RNA_access.h" + #include "BKE_action.h" #include "BKE_fcurve.h" #include "BKE_key.h" @@ -52,8 +54,6 @@ #include "ED_keyframing.h" #include "ED_keyframes_edit.h" -#include "RNA_access.h" - /* This file contains code for various keyframe-editing tools which are 'destructive' * (i.e. they will modify the order of the keyframes, and change the size of the array). * While some of these tools may eventually be moved out into blenkernel, for now, it is diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index 6f5692dbf4c..a1ce256a1af 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -2139,15 +2139,15 @@ static MemoNode * solveJoints(MemoNode *table, BArcIterator *iter, float **vec_c MemoNode *min_node = NULL; float *vec0 = vec_cache[previous]; float *vec1 = vec_cache[current]; - float min_weight; - int min_next; + float min_weight= 0.0f; + int min_next= 0; int next; for (next = current + 1; next <= nb_positions - (joints_left - 1); next++) { MemoNode *next_node; float *vec2 = vec_cache[next]; - float weight = 0; + float weight = 0.0f; /* ADD WEIGHT OF PREVIOUS - CURRENT - NEXT triple */ weight = calcCostAngleLengthDistance(iter, vec_cache, edge, vec0, vec1, vec2, current, next, angle_weight, length_weight, distance_weight); @@ -2824,7 +2824,7 @@ void BIF_retargetArmature(bContext *C) ReebGraph *reebg; double start_time, end_time; double gstart_time, gend_time; - double reeb_time, rig_time, retarget_time, total_time; + double reeb_time, rig_time=0.0, retarget_time=0.0, total_time; gstart_time = start_time = PIL_check_seconds_timer(); diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index c0c1cbc7ac6..ef4e09274f2 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -322,7 +322,7 @@ static void gp_strokepoint_convertcoords (bGPDstroke *gps, bGPDspoint *pt, float } else { short mval[2]; - int mx, my; + int mx=0, my=0; float *fp= give_cursor(NULL, NULL); // XXX should be scene, v3d float dvec[3]; diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index eb79848d7d2..4df8641b455 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -170,6 +170,8 @@ void uiDefAutoButsRNA(const bContext *C, uiLayout *layout, PointerRNA *ptr, int uiItemL(uiLayoutColumn(split, 0), name, 0); col= uiLayoutColumn(split, 0); } + else + col= NULL; /* temp hack to show normal button for spin/screw */ if(strcmp(name, "Axis")==0) { diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 8f40b2e4bfd..afb7e74daff 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1438,7 +1438,7 @@ static void ui_draw_but_HSVCUBE(uiBut *but, rcti *rect) { int a; float h,s,v; - float dx, dy, sx1, sx2, sy, x, y; + float dx, dy, sx1, sx2, sy, x=0.0f, y=0.0f; float col0[4][3]; // left half, rect bottom to top float col1[4][3]; // right half, rect bottom to top diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index fb71fc09108..3d3e29bcc22 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -230,8 +230,8 @@ void duplicate_defgroup ( Object *ob ) bDeformGroup *dg, *cdg; char name[32], s[32]; MDeformWeight *org, *cpy; - MDeformVert *dvert, *dvert_array; - int i, idg, icdg, dvert_tot; + MDeformVert *dvert, *dvert_array=NULL; + int i, idg, icdg, dvert_tot=0; if (ob->type != OB_MESH && ob->type != OB_LATTICE) return; @@ -353,9 +353,8 @@ static void del_defgroup_update_users(Object *ob, int id) void del_defgroup_in_object_mode ( Object *ob ) { bDeformGroup *dg; - MDeformVert *dvert_array, *dvert; - - int i, e, dvert_tot; + MDeformVert *dvert, *dvert_array=NULL; + int i, e, dvert_tot=0; if ((!ob) || (ob->type != OB_MESH && ob->type != OB_LATTICE)) return; diff --git a/source/blender/editors/physics/ed_fluidsim.c b/source/blender/editors/physics/ed_fluidsim.c index 3990521bd1b..a8862eb17de 100644 --- a/source/blender/editors/physics/ed_fluidsim.c +++ b/source/blender/editors/physics/ed_fluidsim.c @@ -93,6 +93,9 @@ #include "WM_api.h" #include "WM_types.h" +/* enable/disable overall compilation */ +#ifndef DISABLE_ELBEEM + /* XXX */ /* from header info.c */ static int start_progress_bar(void) {return 0;}; @@ -121,10 +124,6 @@ char* fluidsimViscosityPresetString[6] = { "INVALID" /* end */ }; -/* enable/disable overall compilation */ -#ifndef DISABLE_ELBEEM - - /* ********************** fluid sim settings struct functions ********************** */ /* helper function */ diff --git a/source/blender/editors/physics/editparticle.c b/source/blender/editors/physics/editparticle.c index 3f7880b7fef..f414297dab4 100644 --- a/source/blender/editors/physics/editparticle.c +++ b/source/blender/editors/physics/editparticle.c @@ -2282,7 +2282,7 @@ static int brush_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *eve ParticleEditSettings *pset= PE_settings(CTX_data_scene(C)); ParticleBrushData *brush; int mode = RNA_enum_get(op->ptr, "mode"); - float original_value; + float original_value=1.0f; if(pset->brushtype < 0) return OPERATOR_CANCELLED; @@ -3570,7 +3570,7 @@ void PE_undo_menu(Scene *scene, Object *ob) ParticleEdit *edit= 0; ParticleUndo *undo; DynStr *ds; - short event; + short event=0; char *menu; if(!PE_can_edit(psys)) return; diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c index 1efa5108b96..e79dbed0661 100644 --- a/source/blender/editors/preview/previewrender.c +++ b/source/blender/editors/preview/previewrender.c @@ -453,7 +453,7 @@ void view3d_previewrender_progress(RenderResult *rr, volatile rcti *renrect) // ScrArea *sa= NULL; // XXX // View3D *v3d= NULL; // XXX RenderLayer *rl; - int ofsx, ofsy; + int ofsx=0, ofsy=0; if(renrect) return; @@ -576,7 +576,7 @@ void BIF_view3d_previewrender(Scene *scene, ScrArea *sa) View3D *v3d= sa->spacedata.first; RegionView3D *rv3d= NULL; // XXX Render *re; - RenderInfo *ri; /* preview struct! */ + RenderInfo *ri=NULL; /* preview struct! */ RenderStats *rstats; RenderData rdata; rctf viewplane; diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 113e7249e65..07aaf0f9b58 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2337,6 +2337,7 @@ static ScrArea *find_area_image_empty(bContext *C) return sa; } +#if 0 // XXX not used static ScrArea *find_empty_image_area(bContext *C) { bScreen *sc= CTX_wm_screen(C); @@ -2353,6 +2354,7 @@ static ScrArea *find_empty_image_area(bContext *C) } return sa; } +#endif // XXX not used static void screen_set_image_output(bContext *C) { diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 720e64d260f..b190b76a81e 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -2763,7 +2763,7 @@ static void project_bucket_bounds(const ProjPaintState *ps, const int bucket_x, static void project_bucket_init(const ProjPaintState *ps, const int thread_index, const int bucket_index, rctf *bucket_bounds) { LinkNode *node; - int face_index, image_index; + int face_index, image_index=0; ImBuf *ibuf = NULL; MTFace *tf; @@ -2820,7 +2820,7 @@ static int project_bucket_face_isect(ProjPaintState *ps, float min[2], float max /* TODO - replace this with a tricker method that uses sideofline for all screenCoords's edges against the closest bucket corner */ rctf bucket_bounds; float p1[2], p2[2], p3[2], p4[2]; - float *v, *v1,*v2,*v3,*v4; + float *v, *v1,*v2,*v3,*v4=NULL; int fidx; project_bucket_bounds(ps, bucket_x, bucket_y, &bucket_bounds); @@ -3194,7 +3194,7 @@ static void project_paint_begin(ProjPaintState *ps) if (tf->tpage && ((G.f & G_FACESELECT)==0 || mf->flag & ME_FACE_SEL)) { - float *v1coSS, *v2coSS, *v3coSS, *v4coSS; + float *v1coSS, *v2coSS, *v3coSS, *v4coSS=NULL; v1coSS = ps->screenCoords[mf->v1]; v2coSS = ps->screenCoords[mf->v2]; @@ -3339,7 +3339,7 @@ static void project_paint_end(ProjPaintState *ps) /* context */ ProjPaintImage *last_projIma; int last_image_index = -1; - int last_tile_width; + int last_tile_width=0; for(a=0, last_projIma=ps->projImages; a < ps->image_tot; a++, last_projIma++) { int size = sizeof(UndoTile **) * IMAPAINT_TILE_NUMBER(last_projIma->ibuf->x) * IMAPAINT_TILE_NUMBER(last_projIma->ibuf->y); @@ -3703,7 +3703,7 @@ static void *do_projectpaint_thread(void *ph_v) ProjPixel *projPixel; int last_index = -1; - ProjPaintImage *last_projIma; + ProjPaintImage *last_projIma= NULL; ImagePaintPartialRedraw *last_partial_redraw_cell; float rgba[4], alpha, dist_nosqrt; diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 30712ea0b07..72f97898891 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -148,7 +148,7 @@ int ED_fileselect_layout_offset(FileLayout* layout, int x, int y) int active_file; if (layout == NULL) - return NULL; + return 0; offsetx = (x)/(layout->tile_w + 2*layout->tile_border_x); offsety = (y)/(layout->tile_h + 2*layout->tile_border_y); @@ -351,7 +351,7 @@ void autocomplete_directory(struct bContext *C, char *str, void *arg_v) for(i= 0; i<nentries; ++i) { struct direntry* file = filelist_file(sfile->files, i); - char* dir = filelist_dir(sfile->files); + const char* dir = filelist_dir(sfile->files); if (file && S_ISDIR(file->type)) { BLI_make_file_string(G.sce, tmp, dir, file->relname); autocomplete_do_name(autocpl,tmp); @@ -362,4 +362,4 @@ void autocomplete_directory(struct bContext *C, char *str, void *arg_v) BLI_add_slash(str); } } -}
\ No newline at end of file +} diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index 36ee64f10fd..6fddd16c174 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -33,7 +33,10 @@ #include "WM_api.h" #include "WM_types.h" + +#include "RNA_access.h" #include "RNA_define.h" + #include "ED_screen.h" #include "outliner_intern.h" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 93c6c535a31..41da2c5a85b 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2974,9 +2974,9 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix float vec[3], vec2[3]; float *vd = pdd->vd; float *cd = pdd->cd; - float ma_r; - float ma_g; - float ma_b; + float ma_r=0.0f; + float ma_g=0.0f; + float ma_b=0.0f; if(pdd->ma_r) { ma_r = *pdd->ma_r; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index fba263f30d5..3cf438bdd32 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -949,6 +949,7 @@ void selectTransformOrientation_func(bContext *C, void *target, void *unused) BIF_selectTransformOrientation(C, (TransformOrientation *) target); } +#if 0 // XXX not used static void view3d_panel_transform_spaces(const bContext *C, Panel *pa) { Scene *scene= CTX_data_scene(C); @@ -999,6 +1000,7 @@ static void view3d_panel_transform_spaces(const bContext *C, Panel *pa) } uiBlockEndAlign(block); } +#endif // XXX not used static void weight_paint_buttons(Scene *scene, uiBlock *block) { @@ -1369,6 +1371,7 @@ static void view3d_panel_object(const bContext *C, Panel *pa) } } +#if 0 // XXX not used anymore static void view3d_panel_background(const bContext *C, Panel *pa) { View3D *v3d= CTX_wm_view3d(C); @@ -1493,6 +1496,7 @@ static void view3d_panel_properties(const bContext *C, Panel *pa) // } uiBlockEndAlign(block); } +#endif // XXX not used anymore #if 0 static void view3d_panel_preview(bContext *C, ARegion *ar, short cntrl) // VIEW3D_HANDLER_PREVIEW @@ -1547,6 +1551,7 @@ static void view3d_panel_gpencil(const bContext *C, Panel *pa) } #endif +#if 0 // XXX not used static void delete_sketch_armature(bContext *C, void *arg1, void *arg2) { BIF_deleteSketch(C); @@ -1727,6 +1732,7 @@ static void view3d_panel_operator_redo(const bContext *C, Panel *pa) RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); uiDefAutoButsRNA(C, pa->layout, &ptr, 2); } +#endif // XXX not used void view3d_buttons_register(ARegionType *art) { diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index b57f4a91004..cb20b3dc93e 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1383,6 +1383,8 @@ void VIEW3D_OT_localview(wmOperatorType *ot) ot->poll= ED_operator_view3d_active; } +#if GAMEBLENDER == 1 + static ListBase queue_back; static void SaveState(bContext *C) { @@ -1425,12 +1427,12 @@ static void RestoreState(bContext *C) /* maybe we need this defined somewhere else */ extern void StartKetsjiShell(struct bContext *C,int always_use_expand_framing); +#endif // GAMEBLENDER == 1 static int game_engine_exec(bContext *C, wmOperator *unused) { - Scene *startscene = CTX_data_scene(C); - #if GAMEBLENDER == 1 + Scene *startscene = CTX_data_scene(C); view3d_operator_needs_opengl(C); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index d1394d65f96..62b68589d98 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -64,6 +64,7 @@ //#include "BIF_editparticle.h" //#include "BIF_meshtools.h" +#include "BKE_animsys.h" #include "BKE_action.h" #include "BKE_anim.h" #include "BKE_armature.h" @@ -305,7 +306,6 @@ void recalcData(TransInfo *t) flushTransSeq(t); } else if (t->spacetype == SPACE_ACTION) { - SpaceAction *sact= (SpaceAction *)t->sa->spacedata.first; Scene *scene; bAnimContext ac; @@ -340,7 +340,6 @@ void recalcData(TransInfo *t) BLI_freelistN(&anim_data); } else if (t->spacetype == SPACE_IPO) { - SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first; Scene *scene; ListBase anim_data = {NULL, NULL}; @@ -374,7 +373,6 @@ void recalcData(TransInfo *t) /* now test if there is a need to re-sort */ for (ale= anim_data.first; ale; ale= ale->next) { FCurve *fcu= (FCurve *)ale->key_data; - AnimData *adt= BKE_animdata_from_id(ale->id); /* watch it: if the time is wrong: do not correct handles yet */ if (test_time_fcurve(fcu)) diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index c656b097cb9..ef92787701c 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -340,7 +340,6 @@ int calc_manipulator_stats(const bContext *C) } } else if(ob && (ob->flag & OB_POSEMODE)) { - bArmature *arm = ob->data; bPoseChannel *pchan; int mode = TFM_ROTATION; // mislead counting bones... bah. We don't know the manipulator mode, could be mixed |