diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-11 23:03:15 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-11 23:14:39 +0300 |
commit | 7a1dc205607a637e92bb5bac23dfb184472d49cb (patch) | |
tree | 1ce44343361e5cc6f98bc82560370147650a55d7 /source/blender | |
parent | 1b3b01135475d0f0edbc39e78fbe5da77b836b67 (diff) |
Cleanup: quite some harmless but noisy warnings from gcc...
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 5 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mask/mask_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 1 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciansmooth.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
12 files changed, 18 insertions, 16 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index bdfb7021370..7ffd300c6de 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -53,8 +53,7 @@ static const char *bc_get_joint_name(T *node) static EditBone *get_edit_bone(bArmature * armature, char *name) { EditBone *eBone; - eBone = (EditBone *)armature->edbo->first; - for (eBone; eBone; eBone = eBone->next) { + for (eBone = (EditBone *)armature->edbo->first; eBone; eBone = eBone->next) { if (!strcmp(name, eBone->name)) return eBone; } @@ -259,7 +258,7 @@ void ArmatureImporter::connect_bone_chains(bArmature *armature, Bone *parentbone Bone *child = (Bone *)parentbone->childbase.first; if (child && (import_settings->find_chains || child->next==NULL) ) { - for (child; child; child = child->next) { + for (; child; child = child->next) { BoneExtended *be = extended_bones[child->name]; if (be != NULL) { if (be->get_chain_length() <= clip) { diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index d316360a1ab..f02c6a234a9 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -904,7 +904,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname if (prop && RNA_property_type(prop) == PROP_ENUM) { EnumPropertyItem *item, *item_array = NULL; bool free; - uiLayout *split; + uiLayout *split = NULL; uiLayout *target; if (radial) { diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index 929c4f74b2f..6580b66c225 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -516,7 +516,7 @@ static bool spline_under_mouse_get(const bContext *C, MaskLayer *mask_layer; int width, height; float pixel_co[2]; - float closest_dist_squared; + float closest_dist_squared = FLT_MAX; MaskLayer *closest_layer = NULL; MaskSpline *closest_spline = NULL; bool undistort = false; @@ -2209,7 +2209,7 @@ static int mask_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) } if (end >= start) { int tot_point; - int tot_point_shape_start; + int tot_point_shape_start = 0; MaskSpline *new_spline = BKE_mask_spline_add(mask_layer); MaskSplinePoint *new_point; int b; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 48e617eda11..67b5c8061cd 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -803,6 +803,7 @@ static void parent_set_vert_find(KDTree *tree, Object *child, int vert_par[3], b tot = BLI_kdtree_find_nearest_n(tree, co_find, nearest, 3); BLI_assert(tot == 3); + UNUSED_VARS(tot); vert_par[0] = nearest[0].index; vert_par[1] = nearest[1].index; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 23b15ea46f4..71714bdcda9 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -895,7 +895,7 @@ static void region_azone_tria(ScrArea *sa, AZone *az, ARegion *ar) static void region_azone_initialize(ScrArea *sa, ARegion *ar, AZEdge edge, const bool is_fullscreen) { - AZone *az; + AZone *az = NULL; const bool is_hidden = (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) == 0; if (is_hidden || !is_fullscreen) { @@ -906,7 +906,7 @@ static void region_azone_initialize(ScrArea *sa, ARegion *ar, AZEdge edge, const az->edge = edge; } - if (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) { + if (!is_hidden) { if (!is_fullscreen) { if (G.debug_value == 3) region_azone_icon(sa, az, ar); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 7324cebbf49..71ce63a8f80 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -2272,7 +2272,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P float paintweight; int *indexar; float totw; - unsigned int index, totindex; + unsigned int index, totindex = 0; float alpha; float mval[2]; bool use_vert_sel; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 6792bbe0577..050b290a75f 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -350,7 +350,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e } else if (left_right != SEQ_SELECT_LR_NONE) { /* use different logic for this */ - float x; + float x = 0.0f; ED_sequencer_deselect_all(scene); switch (left_right) { diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 3aec3d5c975..db3ca0e5465 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5240,6 +5240,8 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l, float tvec[3]; float dist; + zero_v3(tvec); + if (bm_loop_calc_opposite_co(l_tmp, tdir, tvec)) { dist = len_v3v3(l_tmp->v->co, tvec); } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 8d6aae46567..15f9f8df572 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1117,7 +1117,7 @@ static void createTransArmatureVerts(TransInfo *t) bool mirror = ((arm->flag & ARM_MIRROR_EDIT) != 0); int total_mirrored = 0, i; int oldtot; - BoneInitData *bid; + BoneInitData *bid = NULL; t->total = 0; for (ebo = edbo->first; ebo; ebo = ebo->next) { diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 6f33bfa73fc..06a25056e49 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -457,7 +457,7 @@ static void validate_solution(LaplacianSystem *sys, short flag, float lambda, fl { int i; float lam; - float vini, vend; + float vini = 0.0f, vend; if (flag & MOD_LAPLACIANSMOOTH_PRESERVE_VOLUME) { vini = compute_volume(sys->vertexCos, sys->mfaces, sys->numFaces); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 5900baaf537..c5a51035a22 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -174,7 +174,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, MLoopUV **mloopuv_layers = BLI_array_alloca(mloopuv_layers, mloopuv_layers_tot); float uv_u_scale; float uv_v_minmax[2] = {FLT_MAX, -FLT_MAX}; - float uv_v_range_inv; + float uv_v_range_inv = 0.0f; float uv_axis_plane[4]; char axis_char = 'X'; @@ -194,7 +194,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, unsigned int edge_offset; - MPoly *mpoly_orig, *mpoly_new, *mp_new; + MPoly *mpoly_orig = NULL, *mpoly_new, *mp_new; MLoop *mloop_orig, *mloop_new, *ml_new; MEdge *medge_orig, *med_orig, *med_new, *med_new_firstloop, *medge_new; MVert *mvert_new, *mvert_orig, *mv_orig, *mv_new, *mv_new_base; @@ -875,7 +875,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, const unsigned int step_last = step_tot - (close ? 1 : 2); const unsigned int mpoly_index_orig = totpoly ? edge_poly_map[i] : UINT_MAX; const bool has_mpoly_orig = (mpoly_index_orig != UINT_MAX); - float uv_v_offset_a, uv_v_offset_b; + float uv_v_offset_a = 0.0f, uv_v_offset_b = 0.0f; const unsigned int mloop_index_orig[2] = { vert_loop_map ? vert_loop_map[medge_new[i].v1] : UINT_MAX, diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 5b944a7b1ec..3150c030659 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4304,7 +4304,7 @@ static void radial_control_cancel(bContext *C, wmOperator *op) static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *event) { RadialControl *rc = op->customdata; - float new_value, dist, zoom[2]; + float new_value, dist = 0.0f, zoom[2]; float delta[2], ret = OPERATOR_RUNNING_MODAL; bool snap; float angle_precision = 0.0f; |