From 256706ce7e88dfa4ec7f5ff215a03aea2aa5e71a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 21 Jul 2014 20:23:17 +1000 Subject: Cleanup --- source/blender/blenkernel/intern/paint.c | 4 ++-- source/blender/editors/interface/interface_handlers.c | 2 +- source/blender/editors/interface/resources.c | 2 +- source/blender/editors/transform/transform_conversions.c | 3 ++- source/blender/makesrna/intern/rna_brush.c | 6 +++--- source/blender/makesrna/intern/rna_space.c | 8 ++++---- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 48211f2f627..4382d74f34e 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -354,7 +354,7 @@ void BKE_palette_color_delete(struct Palette *palette) { PaletteColor *color = BLI_findlink(&palette->colors, palette->active_color); - if(color) { + if (color) { if ((color == palette->colors.last) && (palette->colors.last != palette->colors.first)) palette->active_color--; @@ -481,7 +481,7 @@ float paint_grid_paint_mask(const GridPaintMask *gpm, unsigned level, return gpm->data[(y * factor) * gridsize + (x * factor)]; } -/* threshhold to move before updating the brush rotation */ +/* threshold to move before updating the brush rotation */ #define RAKE_THRESHHOLD 20 void paint_calculate_rake_rotation(UnifiedPaintSettings *ups, const float mouse_pos[2]) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 76c5861ce0c..db083e494fb 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4319,7 +4319,7 @@ static int ui_do_but_COLOR(bContext *C, uiBut *but, uiHandleButtonData *data, co PaletteColor *color = but->rnapoin.data; palette->active_color = BLI_findindex(&palette->colors, color); - if( !event->ctrl) { + if (!event->ctrl) { float color[3]; Scene *scene = CTX_data_scene(C); Paint *paint = BKE_paint_get_active(scene); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 65c01781d6d..1f66a4a4725 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -2440,7 +2440,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 272|| (U.versionfile == 272 && U.subversionfile < 2)) { + if (U.versionfile < 272 || (U.versionfile == 272 && U.subversionfile < 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set_fl(btheme->tv3d.paint_curve_handle, 0.5f, 1.0f, 0.5f, 0.5f); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index ddc50cbd0fe..3bd191bcc43 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -7039,7 +7039,8 @@ typedef struct TransDataPaintCurve { #define PC_IS_ANY_SEL(pc) (((pc)->bez.f1 | (pc)->bez.f2 | (pc)->bez.f3) & SELECT) -static void PaintCurveConvertHandle(PaintCurvePoint *pcp, int id, TransData2D *td2d, TransDataPaintCurve *tdpc, TransData *td) { +static void PaintCurveConvertHandle(PaintCurvePoint *pcp, int id, TransData2D *td2d, TransDataPaintCurve *tdpc, TransData *td) +{ BezTriple *bezt = &pcp->bez; copy_v2_v2(td2d->loc, bezt->vec[id]); td2d->loc[2] = 0.0f; diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 4aa476f2d6d..e3dbbd21ebb 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -228,7 +228,7 @@ static int rna_SculptToolCapabilities_has_smooth_stroke_get(PointerRNA *ptr) !(br->flag & BRUSH_DRAG_DOT) && !(br->flag & BRUSH_LINE) && !(br->flag & BRUSH_CURVE) && - !ELEM(br->sculpt_tool, + !ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB)); } @@ -246,7 +246,7 @@ static int rna_SculptToolCapabilities_has_space_attenuation_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return ((br->flag & (BRUSH_SPACE | BRUSH_LINE | BRUSH_CURVE)) && - !ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE, + !ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SNAKE_HOOK)); } @@ -306,7 +306,7 @@ static int rna_ImapaintToolCapabilities_has_accumulate_get(PointerRNA *ptr) (br->imagepaint_tool == PAINT_TOOL_SOFTEN) || (br->imagepaint_tool == PAINT_TOOL_SMEAR) || (br->imagepaint_tool == PAINT_TOOL_FILL) || - (br->mtex.tex && !ELEM(br->mtex.brush_map_mode, MTEX_MAP_MODE_TILED, MTEX_MAP_MODE_STENCIL, MTEX_MAP_MODE_3D)) + (br->mtex.tex && !ELEM(br->mtex.brush_map_mode, MTEX_MAP_MODE_TILED, MTEX_MAP_MODE_STENCIL, MTEX_MAP_MODE_3D)) ) ? false : true; } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 653ba2713a3..3e20c593a78 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -89,12 +89,12 @@ EnumPropertyItem space_type_items[] = { static EnumPropertyItem pivot_items_full[] = { {V3D_CENTER, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box Center", - "Pivot around bounding box center of selected object(s)"}, + "Pivot around bounding box center of selected object(s)"}, {V3D_CURSOR, "CURSOR", ICON_CURSOR, "3D Cursor", "Pivot around the 3D cursor"}, {V3D_LOCAL, "INDIVIDUAL_ORIGINS", ICON_ROTATECOLLECTION, - "Individual Origins", "Pivot around each object's own origin"}, + "Individual Origins", "Pivot around each object's own origin"}, {V3D_CENTROID, "MEDIAN_POINT", ICON_ROTATECENTER, "Median Point", - "Pivot around the median point of selected objects"}, + "Pivot around the median point of selected objects"}, {V3D_ACTIVE, "ACTIVE_ELEMENT", ICON_ROTACTIVE, "Active Element", "Pivot around active object"}, {0, NULL, 0, NULL, NULL} }; @@ -812,7 +812,7 @@ static void rna_SpaceImageEditor_scopes_update(Main *UNUSED(bmain), Scene *scene } static EnumPropertyItem *rna_SpaceImageEditor_pivot_itemf(bContext *UNUSED(C), PointerRNA *ptr, - PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) + PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { static EnumPropertyItem pivot_items[] = { {V3D_CENTER, "CENTER", ICON_ROTATE, "Bounding Box Center", ""}, -- cgit v1.2.3