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/mesh | |
parent | 141c6073ca39f0d59c67ebef89b094395b903a4a (diff) |
Cleanup: trailing commas
Needed for clan-format not to wrap onto one line.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 3 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_intersect.c | 6 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 6 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select_similar.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 25 |
6 files changed, 24 insertions, 22 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index ca8260b429e..dde4c9b0fd2 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -208,7 +208,8 @@ static const EnumPropertyItem fill_type_items[] = { {0, "NOTHING", 0, "Nothing", "Don't fill at all"}, {1, "NGON", 0, "Ngon", "Use ngons"}, {2, "TRIFAN", 0, "Triangle Fan", "Use triangle fans"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, +}; static int add_primitive_circle_exec(bContext *C, wmOperator *op) { diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 2a8dde615a3..2c14ab03caf 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -228,7 +228,7 @@ void MESH_OT_intersect(struct wmOperatorType *ot) "Self intersect selected faces"}, {ISECT_SEL_UNSEL, "SELECT_UNSELECT", 0, "Selected/Unselected", "Intersect selected with unselected faces"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem isect_separate_items[] = { @@ -238,7 +238,7 @@ void MESH_OT_intersect(struct wmOperatorType *ot) "Cut into geometry keeping each side separate (Selected/Unselected only)"}, {ISECT_SEPARATE_NONE, "NONE", 0, "Merge", "Merge all geometry from the intersection"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ @@ -324,7 +324,7 @@ void MESH_OT_intersect_boolean(struct wmOperatorType *ot) {BMESH_ISECT_BOOLEAN_ISECT, "INTERSECT", 0, "Intersect", ""}, {BMESH_ISECT_BOOLEAN_UNION, "UNION", 0, "Union", ""}, {BMESH_ISECT_BOOLEAN_DIFFERENCE, "DIFFERENCE", 0, "Difference", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 379c4e71661..d7349ea80df 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -2749,7 +2749,7 @@ wmKeyMap *knifetool_modal_keymap(wmKeyConfig *keyconf) {KNF_MODAL_NEW_CUT, "NEW_CUT", 0, "End Current Cut", ""}, {KNF_MODAL_ADD_CUT, "ADD_CUT", 0, "Add Cut", ""}, {KNF_MODAL_PANNING, "PANNING", 0, "Panning", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Knife Tool Modal Map"); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 4aa9881ddb2..34bf956f7e7 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1459,7 +1459,7 @@ void MESH_OT_select_mode(wmOperatorType *ot) {0, "DISABLE", 0, "Disable", "Disable selected markers"}, {1, "ENABLE", 0, "Enable", "Enable selected markers"}, {2, "TOGGLE", 0, "Toggle", "Toggle disabled flag for selected markers"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ @@ -3323,7 +3323,7 @@ void MESH_OT_select_face_by_sides(wmOperatorType *ot) {1, "EQUAL", 0, "Equal To", ""}, {2, "GREATER", 0, "Greater Than", ""}, {3, "NOTEQUAL", 0, "Not Equal To", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ @@ -4441,7 +4441,7 @@ void MESH_OT_select_axis(wmOperatorType *ot) {SELECT_AXIS_POS, "POS", 0, "Positive Axis", ""}, {SELECT_AXIS_NEG, "NEG", 0, "Negative Axis", ""}, {SELECT_AXIS_ALIGN, "ALIGN", 0, "Aligned Axis", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index d0670026f38..fc058fef209 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -56,7 +56,7 @@ static const EnumPropertyItem prop_similar_compare_types[] = { {SIM_CMP_GT, "GREATER", 0, "Greater", ""}, {SIM_CMP_LT, "LESS", 0, "Less", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_similar_types[] = { @@ -89,7 +89,7 @@ static const EnumPropertyItem prop_similar_types[] = { {SIMFACE_FREESTYLE, "FREESTYLE_FACE", 0, "Freestyle Face Marks", ""}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static int mesh_select_similar_compare_int(const int delta, const int compare) diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index cae06e62efd..a8d8a0c6abd 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -141,7 +141,7 @@ static const EnumPropertyItem prop_mesh_cornervert_types[] = { {SUBD_CORNER_PATH, "PATH", 0, "Path", ""}, {SUBD_CORNER_STRAIGHT_CUT, "STRAIGHT_CUT", 0, "Straight Cut", ""}, {SUBD_CORNER_FAN, "FAN", 0, "Fan", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; void MESH_OT_subdivide(wmOperatorType *ot) @@ -206,7 +206,7 @@ static void mesh_operator_edgering_props(wmOperatorType *ot, const int cuts_min, {SUBD_RING_INTERP_LINEAR, "LINEAR", 0, "Linear", ""}, {SUBD_RING_INTERP_PATH, "PATH", 0, "Blend Path", ""}, {SUBD_RING_INTERP_SURF, "SURFACE", 0, "Blend Surface", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -491,7 +491,7 @@ void MESH_OT_delete(wmOperatorType *ot) {MESH_DELETE_FACE, "FACE", 0, "Faces", ""}, {MESH_DELETE_EDGE_FACE, "EDGE_FACE", 0, "Only Edges & Faces", ""}, {MESH_DELETE_ONLY_FACE, "ONLY_FACE", 0, "Only Faces", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ @@ -2836,7 +2836,7 @@ static const EnumPropertyItem merge_type_items[] = { {MESH_MERGE_CENTER, "CENTER", 0, "At Center", ""}, {MESH_MERGE_CURSOR, "CURSOR", 0, "At Cursor", ""}, {MESH_MERGE_COLLAPSE, "COLLAPSE", 0, "Collapse", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem *merge_type_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free) @@ -3363,7 +3363,7 @@ static const EnumPropertyItem knife_items[] = { {KNIFE_EXACT, "EXACT", 0, "Exact", ""}, {KNIFE_MIDPOINT, "MIDPOINTS", 0, "Midpoints", ""}, {KNIFE_MULTICUT, "MULTICUT", 0, "Multicut", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* bm_edge_seg_isect() Determines if and where a mouse trail intersects an BMEdge */ @@ -4076,7 +4076,7 @@ void MESH_OT_separate(wmOperatorType *ot) {MESH_SEPARATE_SELECTED, "SELECTED", 0, "Selection", ""}, {MESH_SEPARATE_MATERIAL, "MATERIAL", 0, "By Material", ""}, {MESH_SEPARATE_LOOSE, "LOOSE", 0, "By loose parts", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ @@ -4642,7 +4642,8 @@ void MESH_OT_poke(wmOperatorType *ot) {BMOP_POKE_MEDIAN_WEIGHTED, "MEDIAN_WEIGHTED", 0, "Weighted Median", "Weighted median face center"}, {BMOP_POKE_MEDIAN, "MEDIAN", 0, "Median", "Median face center"}, {BMOP_POKE_BOUNDS, "BOUNDS", 0, "Bounds", "Face bounds center"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; /* identifiers */ @@ -6380,7 +6381,7 @@ void MESH_OT_bridge_edge_loops(wmOperatorType *ot) {MESH_BRIDGELOOP_SINGLE, "SINGLE", 0, "Open Loop", ""}, {MESH_BRIDGELOOP_CLOSED, "CLOSED", 0, "Closed Loop", ""}, {MESH_BRIDGELOOP_PAIRS, "PAIRS", 0, "Loop Pairs", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* identifiers */ @@ -7122,7 +7123,7 @@ wmKeyMap *point_normals_modal_keymap(wmKeyConfig *keyconf) "Set new 3D cursor position and use it"}, {EDBM_CLNOR_MODAL_POINTTO_SET_USE_SELECTED, "SET_USE_SELECTED", 0, "Select and Use Mesh Item", "Select new active mesh element and use its location"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const char *keymap_name = "Custom Normals Modal Map"; @@ -7152,7 +7153,7 @@ static EnumPropertyItem clnors_pointto_mode_items[] = { {EDBM_CLNOR_POINTTO_MODE_COORDINATES, "COORDINATES", 0, "Coordinates", "Use static coordinates (defined by various means)"}, {EDBM_CLNOR_POINTTO_MODE_MOUSE, "MOUSE", 0, "Mouse", "Follow mouse cursor"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Initialize loop normal data */ @@ -7768,7 +7769,7 @@ static EnumPropertyItem average_method_items[] = { {EDBM_CLNOR_AVERAGE_LOOP, "CUSTOM_NORMAL", 0, "Custom Normal", "Take Average of vert Normals"}, {EDBM_CLNOR_AVERAGE_FACE_AREA, "FACE_AREA", 0, "Face Area", "Set all vert normals by Face Area"}, {EDBM_CLNOR_AVERAGE_ANGLE, "CORNER_ANGLE", 0, "Corner Angle", "Set all vert normals by Corner Angle"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static int edbm_average_normals_exec(bContext *C, wmOperator *op) @@ -7965,7 +7966,7 @@ static EnumPropertyItem normal_vector_tool_items[] = { {EDBM_CLNOR_TOOLS_ADD, "ADD", 0, "Add Normal", "Add normal vector with selection"}, {EDBM_CLNOR_TOOLS_MULTIPLY, "MULTIPLY", 0, "Multiply Normal", "Multiply normal vector with selection"}, {EDBM_CLNOR_TOOLS_RESET, "RESET", 0, "Reset Normal", "Reset buffer and/or normal of selected element"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static int edbm_normals_tools_exec(bContext *C, wmOperator *op) |