diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:01:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:59:11 +0300 |
commit | 744f6339865fa8ed00b2e98aa5812b94d67a8604 (patch) | |
tree | ac31a849b46a8214baf16b87e104841a5fa85b11 /source/blender/editors/sculpt_paint | |
parent | 141c6073ca39f0d59c67ebef89b094395b903a4a (diff) |
Cleanup: trailing commas
Needed for clan-format not to wrap onto one line.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
8 files changed, 16 insertions, 14 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 976dfee85b4..0f284601f98 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -443,7 +443,7 @@ void PAINT_OT_hide_show(struct wmOperatorType *ot) static const EnumPropertyItem action_items[] = { {PARTIALVIS_HIDE, "HIDE", 0, "Hide", "Hide vertices"}, {PARTIALVIS_SHOW, "SHOW", 0, "Show", "Show vertices"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem area_items[] = { @@ -451,7 +451,7 @@ void PAINT_OT_hide_show(struct wmOperatorType *ot) {PARTIALVIS_INSIDE, "INSIDE", 0, "Inside", "Hide or show vertices inside the selection"}, {PARTIALVIS_ALL, "ALL", 0, "All", "Hide or show all vertices"}, {PARTIALVIS_MASKED, "MASKED", 0, "Masked", "Hide or show vertices that are masked (minimum mask value of 0.5)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 764bfaf9321..182a0912533 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -2595,7 +2595,7 @@ static void project_paint_face_init( ps->do_masking, IMAPAINT_TILE_NUMBER(ibuf->x), tmpibuf, - ps->projImages + image_index + ps->projImages + image_index, }; const MLoopTri *lt = &ps->mlooptri_eval[tri_index]; @@ -5824,7 +5824,7 @@ enum { LAYER_METALLIC, LAYER_NORMAL, LAYER_BUMP, - LAYER_DISPLACEMENT + LAYER_DISPLACEMENT, }; static const EnumPropertyItem layer_type_items[] = { @@ -5835,7 +5835,7 @@ static const EnumPropertyItem layer_type_items[] = { {LAYER_NORMAL, "NORMAL", 0, "Normal", ""}, {LAYER_BUMP, "BUMP", 0, "Bump", ""}, {LAYER_DISPLACEMENT, "DISPLACEMENT", 0, "Displacement", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static Image *proj_paint_image_create(wmOperator *op, Main *bmain) diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 34a09860311..e1e7675b4d3 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -106,7 +106,7 @@ void PAINT_OT_weight_set(struct wmOperatorType *ot); enum { WPAINT_GRADIENT_TYPE_LINEAR, - WPAINT_GRADIENT_TYPE_RADIAL + WPAINT_GRADIENT_TYPE_RADIAL, }; void PAINT_OT_weight_gradient(struct wmOperatorType *ot); diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 00a6c5416fc..4b725d1fa35 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -793,13 +793,13 @@ static void BRUSH_OT_stencil_control(wmOperatorType *ot) {STENCIL_TRANSLATE, "TRANSLATION", 0, "Translation", ""}, {STENCIL_SCALE, "SCALE", 0, "Scale", ""}, {STENCIL_ROTATE, "ROTATION", 0, "Rotation", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem stencil_texture_items[] = { {STENCIL_PRIMARY, "PRIMARY", 0, "Primary", ""}, {STENCIL_SECONDARY, "SECONDARY", 0, "Secondary", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ ot->name = "Stencil Brush Control"; diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 414585cc646..72dd49dd27c 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -212,7 +212,7 @@ void paint_stroke_operator_properties(wmOperatorType *ot) {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Normal", "Apply brush normally"}, {BRUSH_STROKE_INVERT, "INVERT", 0, "Invert", "Invert action of brush for duration of stroke"}, {BRUSH_STROKE_SMOOTH, "SMOOTH", 0, "Smooth", "Switch brush to smooth mode for duration of stroke"}, - {0} + {0}, }; PropertyRNA *prop; @@ -586,7 +586,8 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot) {CURVE_PRESET_LINE, "LINE", 0, "Line", ""}, {CURVE_PRESET_ROUND, "ROUND", 0, "Round", ""}, {CURVE_PRESET_ROOT, "ROOT", 0, "Root", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; ot->name = "Preset"; ot->description = "Set brush shape"; diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index 664298308b2..2ef6dc9b2da 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -140,7 +140,8 @@ void PAINT_OT_weight_from_bones(wmOperatorType *ot) static const EnumPropertyItem type_items[] = { {ARM_GROUPS_AUTO, "AUTOMATIC", 0, "Automatic", "Automatic weights from bones"}, {ARM_GROUPS_ENVELOPE, "ENVELOPES", 0, "From Envelopes", "Weights from envelopes with user defined radius"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; /* identifiers */ ot->name = "Weight from Bones"; @@ -838,7 +839,7 @@ void PAINT_OT_weight_gradient(wmOperatorType *ot) static const EnumPropertyItem gradient_types[] = { {WPAINT_GRADIENT_TYPE_LINEAR, "LINEAR", 0, "Linear", ""}, {WPAINT_GRADIENT_TYPE_RADIAL, "RADIAL", 0, "Radial", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 29e1950efc9..3bf338e6e57 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4566,7 +4566,7 @@ static void sculpt_update_brush_delta(UnifiedPaintSettings *ups, Object *ob, Bru StrokeCache *cache = ss->cache; const float mouse[2] = { cache->mouse[0], - cache->mouse[1] + cache->mouse[1], }; int tool = brush->sculpt_tool; diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index d4e0a82af12..4b417220c53 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -905,7 +905,7 @@ void SCULPT_OT_uv_sculpt_stroke(wmOperatorType *ot) {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Normal", "Apply brush normally"}, {BRUSH_STROKE_INVERT, "INVERT", 0, "Invert", "Invert action of brush for duration of stroke"}, {BRUSH_STROKE_SMOOTH, "RELAX", 0, "Relax", "Switch brush to relax mode for duration of stroke"}, - {0} + {0}, }; /* identifiers */ |