diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-24 00:20:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-24 00:20:24 +0400 |
| commit | cbc431ec1277c300fa43e133c188c65df9b6247a (patch) | |
| tree | 069ca983456f2974386d059d46f26d2f04b230a6 | |
| parent | 999c309b183148146acfc36b15d2b1d149bb5d53 (diff) | |
style cleanup: also remove unused var
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index a5a6a07a0fa..e887610dce2 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1099,7 +1099,7 @@ static bool *vgroup_subset_from_select_type(Object *ob, WT_VertexGroupSelect sub bool *vgroup_validmap = NULL; const int defbase_tot = BLI_countlist(&ob->defbase); - switch(subset_type) { + switch (subset_type) { case WT_VGROUP_ALL: vgroup_validmap = MEM_mallocN(defbase_tot * sizeof(*vgroup_validmap), __func__); memset(vgroup_validmap, true, sizeof(bool) * defbase_tot); diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 9d727dc689f..d82606f52f0 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -679,7 +679,7 @@ int paint_stroke_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_PASS_THROUGH; /* one time initialization */ - if(!stroke->stroke_init) { + if (!stroke->stroke_init) { stroke->smooth_stroke_cursor = WM_paint_cursor_activate(CTX_wm_manager(C), paint_poll, paint_draw_smooth_stroke, stroke); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 30de84611ea..e8b480c1f23 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -887,7 +887,7 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect) * and 2 BREAD_CRUMB_SEPARATORs (6) * and a SHAPE_KEY_PINNED marker and a trailing '\0' (9+1) */ - char bread_crumbs[3*MAX_NAME + 6 + 10]; + char bread_crumbs[3 * MAX_NAME + 6 + 10]; bread_crumbs[0] = '\0'; /* get name of marker on current frame (if available) */ @@ -895,8 +895,8 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect) /* check if there is an object */ if (ob) { - strcat(bread_crumbs," "); - strcat(bread_crumbs,ob->id.name + 2); + strcat(bread_crumbs, " "); + strcat(bread_crumbs, ob->id.name + 2); /* name(s) to display depends on type of object */ if (ob->type == OB_ARMATURE) { @@ -907,7 +907,7 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect) if (arm->act_edbone) { strcat(bread_crumbs, BREAD_CRUMB_SEPARATOR); - strcat(bread_crumbs,((EditBone *)arm->act_edbone)->name); + strcat(bread_crumbs, ((EditBone *)arm->act_edbone)->name); } } else if (ob->mode & OB_MODE_POSE) { @@ -915,7 +915,7 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect) if (arm->act_bone->layer & arm->layer) { strcat(bread_crumbs, BREAD_CRUMB_SEPARATOR); - strcat(bread_crumbs,arm->act_bone->name); + strcat(bread_crumbs, arm->act_bone->name); } } } @@ -923,7 +923,6 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect) else if (ELEM3(ob->type, OB_MESH, OB_LATTICE, OB_CURVE)) { Key *key = NULL; KeyBlock *kb = NULL; - char *bone_name = NULL; /* try to display active bone and active shapekey too (if they exist) */ |