From 9f1a021068bf5d2891aacb49b6d56d6d1f51458c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 24 May 2011 17:25:11 +0000 Subject: [PATCH] remove some warnings and possible use of un-initialized vars. --- source/blender/editors/armature/editarmature.c | 2 -- source/blender/editors/space_graph/graph_select.c | 4 ---- source/blender/editors/space_view3d/drawobject.c | 2 ++ source/blender/windowmanager/intern/wm_operators.c | 3 +++ 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index b31bcc710f4..abf08393544 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -2491,14 +2491,12 @@ static int armature_click_extrude_invoke(bContext *C, wmOperator *op, wmEvent *e Scene *scene; ARegion *ar; View3D *v3d; - RegionView3D *rv3d; float *fp = NULL, tvec[3], oldcurs[3], mval_f[2]; int retv; scene= CTX_data_scene(C); ar= CTX_wm_region(C); v3d = CTX_wm_view3d(C); - rv3d= CTX_wm_region_view3d(C); fp= give_cursor(scene, v3d); diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index da7a95cdbf7..76883027df1 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -1291,15 +1291,11 @@ static void graphkeys_mselect_column (bAnimContext *ac, const int mval[2], short static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *event) { bAnimContext ac; - ARegion *ar; short selectmode; /* get editor data */ if (ANIM_animdata_get_context(C, &ac) == 0) return OPERATOR_CANCELLED; - - /* get useful pointers from animation context data */ - ar= ac.ar; /* select mode is either replace (deselect all, then add) or add/extend */ if (RNA_boolean_get(op->ptr, "extend")) diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index ccfc45826cf..d122f8f0642 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3840,6 +3840,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv case PART_DRAW_COL_ACC: intensity = len_v3v3(pa->state.vel, pa->prev_state.vel)/((pa->state.time-pa->prev_state.time)*part->color_vec_max); break; + default: + intensity= 1.0f; /* should never happen */ } CLAMP(intensity, 0.f, 1.f); weight_to_rgb(intensity, &ma_r, &ma_g, &ma_b); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index fc2c0338bdf..8ac7a3d7eb6 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2835,6 +2835,8 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd alpha = 0.75; break; default: + tex_radius= WM_RADIAL_CONTROL_DISPLAY_SIZE; /* note, this is a dummy value */ + alpha = 0.75; break; } @@ -3094,6 +3096,7 @@ static int radial_control_modal(bContext *C, wmOperator *op, wmEvent *event) if(snap) new_value = DEG2RADF(((int)RAD2DEGF(new_value) + 5) / 10*10); break; default: + new_value = dist; /* dummy value, should this ever happen? - campbell */ break; } -- 2.28.0