[Bf-blender-cvs] [665acf22bd8] blender2.7: Cleanup: commas at the end of enums

Campbell Barton noreply at git.blender.org
Tue Jan 15 14:26:42 CET 2019


Commit: 665acf22bd86f5fa9367da2e2f19d57665dfebf6
Author: Campbell Barton
Date:   Tue Jan 15 23:57:49 2019 +1100
Branches: blender2.7
https://developer.blender.org/rB665acf22bd86f5fa9367da2e2f19d57665dfebf6

Cleanup: commas at the end of enums

Without this clang-format may wrap them onto a single line.

===================================================================

M	source/blender/blenkernel/BKE_DerivedMesh.h
M	source/blender/blenkernel/BKE_action.h
M	source/blender/blenkernel/BKE_animsys.h
M	source/blender/blenkernel/BKE_fcurve.h
M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/BKE_image.h
M	source/blender/blenkernel/BKE_mask.h
M	source/blender/blenkernel/BKE_multires.h
M	source/blender/blenkernel/BKE_paint.h
M	source/blender/blenkernel/BKE_subsurf.h
M	source/blender/blenkernel/BKE_text.h
M	source/blender/blenkernel/depsgraph_private.h
M	source/blender/blenkernel/intern/pbvh_intern.h
M	source/blender/blenkernel/intern/subsurf_ccg.c
M	source/blender/blenlib/BLI_task.h
M	source/blender/blenloader/BLO_readfile.h
M	source/blender/bmesh/bmesh_class.h
M	source/blender/bmesh/intern/bmesh_iterators.h
M	source/blender/bmesh/intern/bmesh_walkers.h
M	source/blender/bmesh/operators/bmo_extrude.c
M	source/blender/bmesh/operators/bmo_hull.c
M	source/blender/bmesh/tools/bmesh_decimate_collapse.c
M	source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
M	source/blender/collada/AnimationImporter.h
M	source/blender/compositor/COM_defines.h
M	source/blender/compositor/intern/COM_ExecutionGroup.h
M	source/blender/compositor/intern/COM_MemoryBuffer.h
M	source/blender/compositor/intern/COM_NodeOperation.h
M	source/blender/compositor/intern/COM_SocketReader.h
M	source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
M	source/blender/compositor/operations/COM_KeyingBlurOperation.h
M	source/blender/editors/animation/anim_channels_edit.c
M	source/blender/editors/armature/editarmature_retarget.c
M	source/blender/editors/armature/pose_slide.c
M	source/blender/editors/gpencil/gpencil_data.c
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/gpencil/gpencil_intern.h
M	source/blender/editors/include/ED_anim_api.h
M	source/blender/editors/include/ED_keyframes_edit.h
M	source/blender/editors/include/ED_node.h
M	source/blender/editors/include/ED_screen_types.h
M	source/blender/editors/include/ED_view3d.h
M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/lattice/editlattice_tools.c
M	source/blender/editors/mask/mask_ops.c
M	source/blender/editors/mesh/editmesh_rip.c
M	source/blender/editors/object/object_bake.c
M	source/blender/editors/object/object_vgroup.c
M	source/blender/editors/sculpt_paint/paint_image_undo.c
M	source/blender/editors/sculpt_paint/paint_ops.c
M	source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/space_file/file_ops.c
M	source/blender/editors/space_file/filelist.h
M	source/blender/editors/space_image/image_ops.c
M	source/blender/editors/space_node/node_edit.c
M	source/blender/editors/space_outliner/outliner_tools.c
M	source/blender/editors/space_view3d/drawobject.c
M	source/blender/editors/space_view3d/view3d_fly.c
M	source/blender/editors/space_view3d/view3d_intern.h
M	source/blender/editors/space_view3d/view3d_ruler.c
M	source/blender/editors/transform/transform.h
M	source/blender/editors/uvedit/uvedit_parametrizer.c
M	source/blender/editors/uvedit/uvedit_parametrizer.h
M	source/blender/gpu/GPU_basic_shader.h
M	source/blender/gpu/GPU_extensions.h
M	source/blender/gpu/GPU_material.h
M	source/blender/gpu/intern/gpu_codegen.c
M	source/blender/gpu/intern/gpu_codegen.h
M	source/blender/ikplugin/intern/itasc_plugin.cpp
M	source/blender/imbuf/IMB_imbuf.h
M	source/blender/imbuf/IMB_imbuf_types.h
M	source/blender/makesdna/DNA_action_types.h
M	source/blender/makesdna/DNA_anim_types.h
M	source/blender/makesdna/DNA_armature_types.h
M	source/blender/makesdna/DNA_brush_types.h
M	source/blender/makesdna/DNA_color_types.h
M	source/blender/makesdna/DNA_constraint_types.h
M	source/blender/makesdna/DNA_curve_types.h
M	source/blender/makesdna/DNA_customdata_types.h
M	source/blender/makesdna/DNA_genfile.h
M	source/blender/makesdna/DNA_gpencil_types.h
M	source/blender/makesdna/DNA_image_types.h
M	source/blender/makesdna/DNA_key_types.h
M	source/blender/makesdna/DNA_mask_types.h
M	source/blender/makesdna/DNA_movieclip_types.h
M	source/blender/makesdna/DNA_nla_types.h
M	source/blender/makesdna/DNA_node_types.h
M	source/blender/makesdna/DNA_packedFile_types.h
M	source/blender/makesdna/DNA_rigidbody_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesdna/DNA_sequence_types.h
M	source/blender/makesdna/DNA_sound_types.h
M	source/blender/makesdna/DNA_space_types.h
M	source/blender/makesdna/DNA_tracking_types.h
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/modifiers/intern/MOD_skin.c
M	source/blender/render/extern/include/RE_pipeline.h
M	source/blender/render/intern/include/render_types.h
M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/intern/wm_playanim.c
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 89f3431fec8..35496ea3313 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -153,7 +153,7 @@ typedef enum DMDrawFlag {
 	DM_DRAW_SKIP_HIDDEN         = (1 << 4),
 	DM_DRAW_SKIP_SELECT         = (1 << 5),
 	DM_DRAW_SELECT_USE_EDITMODE = (1 << 6),
-	DM_DRAW_NEED_NORMALS        = (1 << 7)
+	DM_DRAW_NEED_NORMALS        = (1 << 7),
 } DMDrawFlag;
 
 typedef enum DMForeachFlag {
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index f1858fc18ed..917226888a2 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 40b4bf8e7f5..b66199d58aa 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -85,7 +85,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 f8ba646fd57..99648f61584 100644
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.h
@@ -179,7 +179,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 92e16f02e25..6758630252e 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -92,7 +92,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 bd9aeb1ab11..e2c88798bea 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -149,7 +149,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 5598f0dc473..73d8394f2a0 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 d8199c96d6b..3b58f327b63 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -69,7 +69,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 eedf5f7985e..a8a5aa5274d 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -79,7 +79,7 @@ typedef enum ePaintMode {
 	PAINT_MODE_SCULPT_UV = 5,
 
 	/** Keep last. */
-	PAINT_MODE_INVALID = 6
+	PAINT_MODE_INVALID = 6,
 } ePaintMode;
 
 /* overlay invalidation */
@@ -89,7 +89,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 \
@@ -263,6 +263,6 @@ void BKE_sculpt_toolsettings_data_ensure(struct Scene *scene);
 
 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 96320415b16..f6b5140c9d9 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -96,7 +96,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 b53af3cec53..29ac61c873c 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -131,7 +131,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/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h
index 69ca75836d9..72f4e2524a4 100644
--- a/source/blender/blenkernel/depsgraph_private.h
+++ b/source/blender/blenkernel/depsgraph_private.h
@@ -66,7 +66,7 @@ struct ModifierData;
 enum {
 	DAG_WHITE = 0,
 	DAG_GRAY = 1,
-	DAG_BLACK = 2
+	DAG_BLACK = 2,
 };
 
 typedef struct DagAdjList {
diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h
index 4aef97bda47..1f85b4b227b 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 3c4e1f92344..4e82cfbff99 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -131,7 +131,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,
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h
index 9194caca007..50f428bdbee 100644
--- a/source/blender/blenlib/BLI_task.h
+++ b/source/blender/blenlib/BLI_task.h
@@ -52,7 +52,7 @@ typedef struct TaskScheduler TaskScheduler;
 
 enum {
 	TASK_SCHEDULER_AUTO_THREADS = 0,
-	TASK_SCHEDULER_SINGLE_THREAD = 1
+	TASK_SCHEDULER_SINGLE_THREAD = 1,
 };
 
 TaskScheduler *BLI_task_scheduler_create(int num_threads);
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 5a1c479f450..102e892c775 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -55,7 +55,7 @@ typedef struct BlendHandle BlendHandle;
 typedef enum eBlenFileType {
 	BLENFILETYPE_BLEND = 1,
 	BLENFILETYPE_PUB = 2,
-	BLENFILETYPE_RUNTIME = 3
+	BLENFILETYPE_RUNTIME = 3,
 } eBlenFileType;
 
 typedef struct BlendFileData {
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 10e2892c5a5..79fdfd910fa 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -260,7 +260,7 @@ enum {
 	BM_VERT = 1,
 	BM_EDGE = 2,
 	BM_LOOP = 4,
-	BM_FACE = 8
+	BM_FACE = 8,
 };
 
 #define BM_ALL (BM_VERT | BM_EDGE | BM_LOOP | BM_FACE)
diff --git a/source/blender/bmesh/intern/bmesh_iterators.h b/source/blender/bmesh/intern/bmesh_iterators.h
index ab066682081..0ae7e1f805b 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.h
+++ b/source/blender/bmesh/intern/bmesh_iterators.h
@@ -75,7 +75,7 @@ typedef enum BMIterType {
 	 * from the other faces in the radial cycle surrounding the
 	 * input loop's edge.*/
 	BM_LOOPS_OF_LOOP = 12,
-	BM_LOOPS_OF_EDGE = 13
+	BM_LOOPS_OF_EDGE = 13,
 } BMIterType;
 
 #define BM_ITYPE_MAX 14
diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.h
index b2373a069db..08b3f87bd1a 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.h
+++ b/source/blender/bmesh/intern/bmesh_walkers.h
@@ -38,7 +38,7 @@ typedef enum {
 
 typedef enum {
 	BMW_FLAG_NOP = 0,
-	BMW_FLAG_TEST_HIDDEN = (1 << 0)
+	BMW_FLAG_TEST_HIDDEN = (1 << 0),
 } BMWFlag;
 
 /*Walkers*/
diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c
index a13024d8793..33b15f1772a 100644
--- a/source/blender/bmesh/operators/bmo_extrude.c
+++ b/source/blender/bmesh/operators/bmo_extrude.c
@@ -44,7 +44,7 @@
 enum {
 	EXT_INPUT   = 1,
 	EXT_KEEP    = 2,
-	EXT_DEL     = 4
+	EXT_DEL     = 4,
 };
 
 #define VERT_MARK 1
diff --git a/source/blender/bmesh/operators/bmo_hull.c b/sou

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list