[Bf-blender-cvs] [dbc058301bf] master: Cleanup: trailing commas
Campbell Barton
noreply at git.blender.org
Tue Apr 16 16:41:33 CEST 2019
Commit: dbc058301bf516a53b92b9c45b5c4f3ecc33ecf4
Author: Campbell Barton
Date: Tue Apr 16 16:40:47 2019 +0200
Branches: master
https://developer.blender.org/rBdbc058301bf516a53b92b9c45b5c4f3ecc33ecf4
Cleanup: trailing commas
===================================================================
M source/blender/avi/AVI_avi.h
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_editmesh_bvh.h
M source/blender/blenkernel/BKE_fcurve.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/intern/CCGSubSurf_intern.h
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/fmodifier.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/seqmodifier.c
M source/blender/blenlib/BLI_callbacks.h
M source/blender/blenlib/BLI_math_rotation.h
M source/blender/blenlib/BLI_string_cursor_utf8.h
M source/blender/blenlib/BLI_task.h
M source/blender/blenlib/intern/BLI_timer.c
M source/blender/blenlib/intern/string_cursor_utf8.c
M source/blender/bmesh/intern/bmesh_iterators.c
M source/blender/bmesh/intern/bmesh_mods.h
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/intern/bmesh_walkers.h
M source/blender/collada/AnimationExporter.h
M source/blender/collada/BCAnimationCurve.h
M source/blender/collada/ExportSettings.h
M source/blender/collada/ImageExporter.cpp
M source/blender/collada/MeshImporter.cpp
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
M source/blender/compositor/operations/COM_QualityStepHelper.h
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_armature.c
M source/blender/draw/intern/draw_manager.h
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/include/ED_fileselect.h
M source/blender/editors/include/ED_keyframes_draw.h
M source/blender/editors/include/ED_keyframes_edit.h
M source/blender/editors/include/ED_screen_types.h
M source/blender/editors/include/ED_transverts.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/space_graph/graph_select.c
M source/blender/editors/space_node/node_group.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/transform/transform.c
M source/blender/freestyle/intern/python/BPy_MediumType.cpp
M source/blender/freestyle/intern/view_map/Interface1D.h
M source/blender/gpu/GPU_batch.h
M source/blender/gpu/GPU_element.h
M source/blender/gpu/GPU_primitive.h
M source/blender/gpu/GPU_state.h
M source/blender/gpu/GPU_vertex_buffer.h
M source/blender/gpu/GPU_vertex_format.h
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_framebuffer.c
M source/blender/imbuf/IMB_thumbs.h
M source/blender/imbuf/intern/thumbs.c
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_boid_types.h
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_object_force_types.h
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_shader_fx_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/RNA_types.h
M source/blender/nodes/composite/nodes/node_composite_cornerpin.c
M source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
M source/blender/nodes/shader/nodes/node_shader_particle_info.c
M source/blender/nodes/texture/nodes/node_texture_at.c
M source/blender/nodes/texture/nodes/node_texture_bricks.c
M source/blender/nodes/texture/nodes/node_texture_checker.c
M source/blender/nodes/texture/nodes/node_texture_compose.c
M source/blender/nodes/texture/nodes/node_texture_coord.c
M source/blender/nodes/texture/nodes/node_texture_decompose.c
M source/blender/nodes/texture/nodes/node_texture_distance.c
M source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
M source/blender/nodes/texture/nodes/node_texture_image.c
M source/blender/nodes/texture/nodes/node_texture_invert.c
M source/blender/nodes/texture/nodes/node_texture_math.c
M source/blender/nodes/texture/nodes/node_texture_mixRgb.c
M source/blender/nodes/texture/nodes/node_texture_rotate.c
M source/blender/nodes/texture/nodes/node_texture_scale.c
M source/blender/nodes/texture/nodes/node_texture_texture.c
M source/blender/nodes/texture/nodes/node_texture_translate.c
M source/blender/nodes/texture/nodes/node_texture_valToNor.c
M source/blender/nodes/texture/nodes/node_texture_viewer.c
M source/blender/python/bmesh/bmesh_py_types.h
M source/blender/python/generic/bgl.c
M source/blender/python/mathutils/mathutils_Color.c
M source/blender/python/mathutils/mathutils_Euler.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/python/mathutils/mathutils_bvhtree.c
M source/blender/python/mathutils/mathutils_kdtree.c
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index ce1c2ed343b..e4bd0025e7b 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -156,7 +156,7 @@ typedef enum {
AVI_FORMAT_RGB24, /* The most basic of forms, 3 bytes per pixel, 1 per r, g, b */
AVI_FORMAT_RGB32, /* The second most basic of forms, 4 bytes per pixel, 1 per r, g, b, alpha */
AVI_FORMAT_AVI_RGB, /* Same as above, but is in the weird AVI order (bottom to top, left to right) */
- AVI_FORMAT_MJPEG /* Motion-JPEG */
+ AVI_FORMAT_MJPEG, /* Motion-JPEG */
} AviFormat;
typedef struct _AviStreamRec {
@@ -198,7 +198,7 @@ typedef enum {
AVI_ERROR_FORMAT,
AVI_ERROR_ALLOC,
AVI_ERROR_FOUND,
- AVI_ERROR_OPTION
+ AVI_ERROR_OPTION,
} AviError;
/* belongs to the option-setting function. */
@@ -206,7 +206,7 @@ typedef enum {
AVI_OPTION_WIDTH = 0,
AVI_OPTION_HEIGHT,
AVI_OPTION_QUALITY,
- AVI_OPTION_FRAMERATE
+ AVI_OPTION_FRAMERATE,
} AviOption;
/* The offsets that will always stay the same in AVI files we
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 46938b13ea6..1333a4cac39 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -100,7 +100,7 @@ typedef struct DMFlagMat {
typedef enum DerivedMeshType {
DM_TYPE_CDDM,
- DM_TYPE_CCGDM
+ DM_TYPE_CCGDM,
} DerivedMeshType;
typedef enum DMForeachFlag {
diff --git a/source/blender/blenkernel/BKE_editmesh_bvh.h b/source/blender/blenkernel/BKE_editmesh_bvh.h
index 10265ed2a36..420250ab25c 100644
--- a/source/blender/blenkernel/BKE_editmesh_bvh.h
+++ b/source/blender/blenkernel/BKE_editmesh_bvh.h
@@ -68,7 +68,7 @@ struct BVHTreeOverlap *BKE_bmbvh_overlap(const BMBVHTree *bmtree_a, const BMBVHT
enum {
BMBVH_RETURN_ORIG = (1 << 0), /* use with 'cos_cage', returns hits in relation to original geometry */
BMBVH_RESPECT_SELECT = (1 << 1), /* restrict to hidden geometry (overrides BMBVH_RESPECT_HIDDEN) */
- BMBVH_RESPECT_HIDDEN = (1 << 2) /* omit hidden geometry */
+ BMBVH_RESPECT_HIDDEN = (1 << 2), /* omit hidden geometry */
};
#endif /* __BKE_EDITMESH_BVH_H__ */
diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h
index d9435534244..d89f4984cbb 100644
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.h
@@ -160,7 +160,7 @@ typedef enum eFMI_Action_Types {
/* modifier only modifies the values of points (but times stay the same) */
FMI_TYPE_REPLACE_VALUES,
/* modifier generates a curve regardless of what came before */
- FMI_TYPE_GENERATE_CURVE
+ FMI_TYPE_GENERATE_CURVE,
} eFMI_Action_Types;
/* Flags for the requirements of a FModifier Type */
@@ -271,7 +271,7 @@ typedef enum eFCU_Cycle_Type {
/* The cycle repeats identically to the base range. */
FCU_CYCLE_PERFECT,
/* The cycle accumulates the change between start and end keys. */
- FCU_CYCLE_OFFSET
+ FCU_CYCLE_OFFSET,
} eFCU_Cycle_Type;
eFCU_Cycle_Type BKE_fcurve_get_cycle_type(struct FCurve *fcu);
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 80b0f9a023f..3f386782346 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -253,7 +253,7 @@ typedef enum eNodeSizePreset {
NODE_SIZE_DEFAULT,
NODE_SIZE_SMALL,
NODE_SIZE_MIDDLE,
- NODE_SIZE_LARGE
+ NODE_SIZE_LARGE,
} eNodeSizePreset;
struct bNodeTreeExec;
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 4a1470797ba..795e9650e58 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -331,7 +331,7 @@ typedef enum eObRelationTypes {
typedef enum eObjectSet {
OB_SET_SELECTED, /* Selected Objects */
OB_SET_VISIBLE, /* Visible Objects */
- OB_SET_ALL /* All Objects */
+ OB_SET_ALL, /* All Objects */
} eObjectSet;
struct LinkNode *BKE_object_relational_superset(
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 9be2d645fde..fa779f48e79 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -132,7 +132,7 @@ void BKE_pbvh_draw_cb(
typedef enum {
PBVH_FACES,
PBVH_GRIDS,
- PBVH_BMESH
+ PBVH_BMESH,
} PBVHType;
PBVHType BKE_pbvh_type(const PBVH *bvh);
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 72cdaf97ec3..6a3b3cc5d03 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -258,7 +258,7 @@ typedef enum {
SEQ_STRIPELEM_IBUF,
SEQ_STRIPELEM_IBUF_COMP,
SEQ_STRIPELEM_IBUF_STARTSTILL,
- SEQ_STRIPELEM_IBUF_ENDSTILL
+ SEQ_STRIPELEM_IBUF_ENDSTILL,
} eSeqStripElemIBuf;
void BKE_sequencer_cache_destruct(void);
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h
index 3f3341533b9..8faf95ca508 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h
@@ -99,15 +99,15 @@ struct DerivedMesh;
enum {
Vert_eEffected = (1 << 0),
Vert_eChanged = (1 << 1),
- Vert_eSeam = (1 << 2)
+ Vert_eSeam = (1 << 2),
} /*VertFlags*/;
enum {
- Edge_eEffected = (1 << 0)
+ Edge_eEffected = (1 << 0),
} /*CCGEdgeFlags*/;
enum {
- Face_eEffected = (1 << 0)
+ Face_eEffected = (1 << 0),
} /*FaceFlags*/;
struct CCGVert {
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index e0bc914dd78..bc6c0782726 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -207,7 +207,7 @@ typedef enum eGPCurveMappingPreset {
GPCURVE_PRESET_PENCIL = 0,
GPCURVE_PRESET_INK = 1,
GPCURVE_PRESET_INKNOISE = 2,
- GPCURVE_PRESET_MARKER = 3
+ GPCURVE_PRESET_MARKER = 3,
} eGPCurveMappingPreset;
static void brush_gpencil_curvemap_reset(CurveMap *cuma, int tot, int preset)
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 59a374d5e88..c774e2ff157 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -663,7 +663,7 @@ static bConstraintTypeInfo CTI_CONSTRNAME = {
constrname_get_tars, /* get constraint targets */
constrname_flush_tars, /* flush constraint targets */
constrname_get_tarmat, /* get target matrix */
- constrname_evaluate /* evaluate */
+ constrname_evaluate, /* evaluate */
};
#endif
@@ -916,7 +916,7 @@ static bConstraintTypeInfo CTI_CHILDOF = {
childof_get_tars, /* get constraint targets */
childof_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get a target matrix */
- childof_evaluate /* evaluate */
+ childof_evaluate, /* evaluate */
};
/* -------- TrackTo Constraint ------- */
@@ -1094,7 +1094,7 @@ static bConstraintTypeInfo CTI_TRACKTO = {
trackto_get_tars, /* get constraint targets */
trackto_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- trackto_evaluate /* evaluate */
+ trackto_evaluate, /* evaluate */
};
/* --------- Inverse-Kinematics --------- */
@@ -1187,7 +1187,7 @@ static bConstraintTypeInfo CTI_KINEMATIC = {
kinematic_get_tars, /* get constraint targets */
kinematic_flush_tars, /* flush constraint targets */
kinematic_get_tarmat, /* get target matrix */
- NULL /* evaluate - solved as separate loop */
+ NULL, /* evaluate - solved as separate loop */
};
/* -------- Follow-Path Constraint ---------- */
@@ -1358,7 +1358,7 @@ static bConstraintTypeInfo CTI_FOLLOWPATH = {
followpath_get_tars, /* get constraint targets */
followpath_flush_tars, /* flush constraint targets */
followpath_get_tarmat, /* get target matrix */
- followpath_evaluate /* evaluate */
+ followpath_evaluate, /* evaluate */
};
/* --------- Limit Location --------- */
@@ -1406,7 +1406,7 @@ static bConstraintTypeInfo CTI_LOCLIMIT = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- loclimit_evaluate /* evaluate */
+ loclimit_evaluate, /* evaluate */
};
/* -------- Limit Rotation --------- */
@@ -1463,7 +1463,7 @@ static bConstraintTypeInfo CTI_ROTLIMIT = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- rotlimit_evaluate /* evaluate */
+ rotlimit_evaluate, /* evaluate */
};
/* --------- Limit Scale --------- */
@@ -1522,7 +1522,7 @@ static bConstraintTypeInfo CTI_SIZELIMIT = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- sizelimit_evaluate /* evaluate */
+ sizelimit_evaluate, /* evaluate */
};
/* ----------- Copy Location ------------- */
@@ -1612,7 +1612,7 @@ static bConstraintTypeInfo CTI_LOCLIKE = {
loclike_get_tars, /* get constraint targets */
loclike_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- loclike_evaluate /* evaluate */
+ loclike_evaluate, /* evaluate */
};
/* ----------- Copy Rotation ------------- */
@@ -1724,7 +1724,7 @@ static bConstraintTypeInfo CTI_ROTLIKE = {
rotlike_get_tars, /* get constraint targets */
rotlike_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- rotlike_evaluate /* evaluate */
+ rotlike_evaluate, /* evaluate */
};
/* ---------- Copy Scale ---------- */
@@ -1819,7 +1819,7 @@ static bConstraintTypeInfo CTI_SIZELIKE = {
sizelike_get_tars, /* get constraint targets */
sizelike_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- sizelike_evaluate /* evaluate */
+ sizelike_evaluate, /* evaluate */
};
/* ----------- Copy Transforms ------------- */
@@ -1880,7 +1880,7 @@ static bConstraintTypeInfo CTI_TRANSLIKE = {
translike_get_tars, /* get constraint targets */
translike_flush_tars, /* flush constraint targets */
default_get_tarmat_full_bbone, /* get target matrix */
- translike_evaluate /* evaluate */
+ translike_evaluate
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list