From 88a80fcec8672b5bb67041456dc7f7101aae3d55 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 15 Jan 2019 23:57:49 +1100 Subject: Cleanup: commas at the end of enums Without this clang-format may wrap them onto a single line. --- source/blender/blenkernel/BKE_action.h | 2 +- source/blender/blenkernel/BKE_animsys.h | 2 +- source/blender/blenkernel/BKE_fcurve.h | 2 +- source/blender/blenkernel/BKE_gpencil.h | 2 +- source/blender/blenkernel/BKE_image.h | 2 +- source/blender/blenkernel/BKE_mask.h | 2 +- source/blender/blenkernel/BKE_multires.h | 2 +- source/blender/blenkernel/BKE_paint.h | 4 ++-- source/blender/blenkernel/BKE_subsurf.h | 2 +- source/blender/blenkernel/BKE_text.h | 2 +- source/blender/blenkernel/intern/pbvh_intern.h | 2 +- source/blender/blenkernel/intern/subsurf_ccg.c | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index 7f4feb6c2d5..4e5afde97e0 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -90,7 +90,7 @@ typedef enum eAction_TransformFlags { /* all flags */ ACT_TRANS_ONLY = (ACT_TRANS_LOC | ACT_TRANS_ROT | ACT_TRANS_SCALE), - ACT_TRANS_ALL = (ACT_TRANS_ONLY | ACT_TRANS_PROP) + ACT_TRANS_ALL = (ACT_TRANS_ONLY | ACT_TRANS_PROP), } eAction_TransformFlags; /* Return flags indicating which transforms the given object/posechannel has diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index b49eb182981..0ed0339c5f8 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -87,7 +87,7 @@ typedef enum eAnimData_MergeCopy_Modes { ADT_MERGECOPY_SRC_COPY = 1, /* Use src action (but just reference the existing version) */ - ADT_MERGECOPY_SRC_REF = 2 + ADT_MERGECOPY_SRC_REF = 2, } eAnimData_MergeCopy_Modes; void BKE_animdata_merge_copy( diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index f6490930530..fd39e735fd7 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -183,7 +183,7 @@ typedef enum eFMI_Requirement_Flags { FMI_REQUIRES_RUNTIME_CHECK = (1 << 2), /* Requires to store data shared between time and valua evaluation */ - FMI_REQUIRES_STORAGE = (1 << 3) + FMI_REQUIRES_STORAGE = (1 << 3), } eFMI_Requirement_Flags; /* Function Prototypes for FModifierTypeInfo's */ diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index 02495f861ab..8c680feb04c 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -127,7 +127,7 @@ typedef enum eGP_GetFrame_Mode { /* Add a new empty/blank frame */ GP_GETFRAME_ADD_NEW = 1, /* Make a copy of the active frame */ - GP_GETFRAME_ADD_COPY = 2 + GP_GETFRAME_ADD_COPY = 2, } eGP_GetFrame_Mode; struct bGPDframe *BKE_gpencil_layer_getframe(struct bGPDlayer *gpl, int cframe, eGP_GetFrame_Mode addnew); diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index 4bcb8e0c15d..0b21ecf8e02 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -147,7 +147,7 @@ struct RenderResult; enum { IMA_GENTYPE_BLANK = 0, IMA_GENTYPE_GRID = 1, - IMA_GENTYPE_GRID_COLOR = 2 + IMA_GENTYPE_GRID_COLOR = 2, }; /* ima->ok */ diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index 976ee5b2691..e0383f7e5ba 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -99,7 +99,7 @@ struct BezTriple *BKE_mask_spline_point_next_bezt(struct MaskSpline *spline, str typedef enum { MASK_PROJ_NEG = -1, MASK_PROJ_ANY = 0, - MASK_PROJ_POS = 1 + MASK_PROJ_POS = 1, } eMaskSign; float BKE_mask_spline_project_co(struct MaskSpline *spline, struct MaskSplinePoint *point, float start_u, const float co[2], const eMaskSign sign); diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index bc01cc6b45c..7cefda3330d 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -74,7 +74,7 @@ typedef enum { MULTIRES_USE_LOCAL_MMD = 1, MULTIRES_USE_RENDER_PARAMS = 2, MULTIRES_ALLOC_PAINT_MASK = 4, - MULTIRES_IGNORE_SIMPLIFY = 8 + MULTIRES_IGNORE_SIMPLIFY = 8, } MultiresFlags; struct DerivedMesh *multires_make_derived_from_derived(struct DerivedMesh *dm, diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 00425de50e0..4f9c0f4ee2e 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -99,7 +99,7 @@ typedef enum eOverlayControlFlags { PAINT_OVERLAY_INVALID_CURVE = (1 << 3), PAINT_OVERLAY_OVERRIDE_CURSOR = (1 << 4), PAINT_OVERLAY_OVERRIDE_PRIMARY = (1 << 5), - PAINT_OVERLAY_OVERRIDE_SECONDARY = (1 << 6) + PAINT_OVERLAY_OVERRIDE_SECONDARY = (1 << 6), } eOverlayControlFlags; #define PAINT_OVERRIDE_MASK \ @@ -297,6 +297,6 @@ struct PBVH *BKE_sculpt_object_pbvh_ensure(struct Depsgraph *depsgraph, struct O enum { SCULPT_MASK_LAYER_CALC_VERT = (1 << 0), - SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1) + SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1), }; #endif diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 6cb09ff8822..ba367854c6b 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -97,7 +97,7 @@ typedef enum MultiresModifiedFlags { * have to be updated */ MULTIRES_COORDS_MODIFIED = 1, /* indicates elements have been hidden or unhidden */ - MULTIRES_HIDDEN_MODIFIED = 2 + MULTIRES_HIDDEN_MODIFIED = 2, } MultiresModifiedFlags; /**************************** Internal *****************************/ diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index e7a8fb1c4a9..41fca2af360 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -127,7 +127,7 @@ extern int text_check_identifier_nodigit_unicode(const unsigned int ch); enum { TXT_MOVE_LINE_UP = -1, - TXT_MOVE_LINE_DOWN = 1 + TXT_MOVE_LINE_DOWN = 1, }; typedef struct TextUndoBuf { diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h index ea8bd1933cd..12e353e7366 100644 --- a/source/blender/blenkernel/intern/pbvh_intern.h +++ b/source/blender/blenkernel/intern/pbvh_intern.h @@ -112,7 +112,7 @@ struct PBVHNode { }; typedef enum { - PBVH_DYNTOPO_SMOOTH_SHADING = 1 + PBVH_DYNTOPO_SMOOTH_SHADING = 1, } PBVHFlags; typedef struct PBVHBMeshLog PBVHBMeshLog; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index bba3e97cad7..d51cde49072 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -126,7 +126,7 @@ typedef enum { CCG_CALC_NORMALS = 4, /* add an extra four bytes for a mask layer */ CCG_ALLOC_MASK = 8, - CCG_SIMPLE_SUBDIV = 16 + CCG_SIMPLE_SUBDIV = 16, } CCGFlags; static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels, -- cgit v1.2.3