Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-16 17:40:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-16 17:40:47 +0300
commitdbc058301bf516a53b92b9c45b5c4f3ecc33ecf4 (patch)
treed93fb65825e40300f68707ae75718773bc73678f /source/blender/blenkernel/intern
parentd217b23f735cb9232d86c7730ed0a0aa45e3074e (diff)
Cleanup: trailing commas
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/CCGSubSurf_intern.h6
-rw-r--r--source/blender/blenkernel/intern/brush.c2
-rw-r--r--source/blender/blenkernel/intern/constraint.c60
-rw-r--r--source/blender/blenkernel/intern/fmodifier.c18
-rw-r--r--source/blender/blenkernel/intern/image.c2
-rw-r--r--source/blender/blenkernel/intern/pbvh.c2
-rw-r--r--source/blender/blenkernel/intern/seqmodifier.c14
7 files changed, 52 insertions, 52 deletions
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, /* evaluate */
};
/* ---------- Maintain Volume ---------- */
@@ -1937,7 +1937,7 @@ static bConstraintTypeInfo CTI_SAMEVOL = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- samevolume_evaluate /* evaluate */
+ samevolume_evaluate, /* evaluate */
};
/* ----------- Python Constraint -------------- */
@@ -2057,7 +2057,7 @@ static bConstraintTypeInfo CTI_PYTHON = {
pycon_get_tars, /* get constraint targets */
NULL, /* flush constraint targets */
pycon_get_tarmat, /* get target matrix */
- pycon_evaluate /* evaluate */
+ pycon_evaluate, /* evaluate */
};
/* ----------- Armature Constraint -------------- */
@@ -2263,7 +2263,7 @@ static bConstraintTypeInfo CTI_ARMATURE = {
armdef_get_tars, /* get constraint targets */
NULL, /* flush constraint targets */
armdef_get_tarmat, /* get target matrix */
- armdef_evaluate /* evaluate */
+ armdef_evaluate, /* evaluate */
};
/* -------- Action Constraint ----------- */
@@ -2427,7 +2427,7 @@ static bConstraintTypeInfo CTI_ACTION = {
actcon_get_tars, /* get constraint targets */
actcon_flush_tars, /* flush constraint targets */
actcon_get_tarmat, /* get target matrix */
- actcon_evaluate /* evaluate */
+ actcon_evaluate, /* evaluate */
};
/* --------- Locked Track ---------- */
@@ -2735,7 +2735,7 @@ static bConstraintTypeInfo CTI_LOCKTRACK = {
locktrack_get_tars, /* get constraint targets */
locktrack_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- locktrack_evaluate /* evaluate */
+ locktrack_evaluate, /* evaluate */
};
/* ---------- Limit Distance Constraint ----------- */
@@ -2869,7 +2869,7 @@ static bConstraintTypeInfo CTI_DISTLIMIT = {
distlimit_get_tars, /* get constraint targets */
distlimit_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get a target matrix */
- distlimit_evaluate /* evaluate */
+ distlimit_evaluate, /* evaluate */
};
/* ---------- Stretch To ------------ */
@@ -3081,7 +3081,7 @@ static bConstraintTypeInfo CTI_STRETCHTO = {
stretchto_get_tars, /* get constraint targets */
stretchto_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- stretchto_evaluate /* evaluate */
+ stretchto_evaluate, /* evaluate */
};
/* ---------- Floor ------------ */
@@ -3225,7 +3225,7 @@ static bConstraintTypeInfo CTI_MINMAX = {
minmax_get_tars, /* get constraint targets */
minmax_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- minmax_evaluate /* evaluate */
+ minmax_evaluate, /* evaluate */
};
/* -------- Clamp To ---------- */
@@ -3391,7 +3391,7 @@ static bConstraintTypeInfo CTI_CLAMPTO = {
clampto_get_tars, /* get constraint targets */
clampto_flush_tars, /* flush constraint targets */
clampto_get_tarmat, /* get target matrix */
- clampto_evaluate /* evaluate */
+ clampto_evaluate, /* evaluate */
};
/* ---------- Transform Constraint ----------- */
@@ -3554,7 +3554,7 @@ static bConstraintTypeInfo CTI_TRANSFORM = {
transform_get_tars, /* get constraint targets */
transform_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get a target matrix */
- transform_evaluate /* evaluate */
+ transform_evaluate, /* evaluate */
};
/* ---------- Shrinkwrap Constraint ----------- */
@@ -3767,7 +3767,7 @@ static bConstraintTypeInfo CTI_SHRINKWRAP = {
shrinkwrap_get_tars, /* get constraint targets */
shrinkwrap_flush_tars, /* flush constraint targets */
shrinkwrap_get_tarmat, /* get a target matrix */
- shrinkwrap_evaluate /* evaluate */
+ shrinkwrap_evaluate, /* evaluate */
};
/* --------- Damped Track ---------- */
@@ -3928,7 +3928,7 @@ static bConstraintTypeInfo CTI_DAMPTRACK = {
damptrack_get_tars, /* get constraint targets */
damptrack_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- damptrack_evaluate /* evaluate */
+ damptrack_evaluate, /* evaluate */
};
/* ----------- Spline IK ------------ */
@@ -4018,7 +4018,7 @@ static bConstraintTypeInfo CTI_SPLINEIK = {
splineik_get_tars, /* get constraint targets */
splineik_flush_tars, /* flush constraint targets */
splineik_get_tarmat, /* get target matrix */
- NULL /* evaluate - solved as separate loop */
+ NULL, /* evaluate - solved as separate loop */
};
/* ----------- Pivot ------------- */
@@ -4142,7 +4142,7 @@ static bConstraintTypeInfo CTI_PIVOT = {
pivotcon_get_tars, /* get constraint targets */
pivotcon_flush_tars, /* flush constraint targets */
default_get_tarmat, /* get target matrix */
- pivotcon_evaluate /* evaluate */
+ pivotcon_evaluate, /* evaluate */
};
/* ----------- Follow Track ------------- */
@@ -4392,7 +4392,7 @@ static bConstraintTypeInfo CTI_FOLLOWTRACK = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- followtrack_evaluate /* evaluate */
+ followtrack_evaluate, /* evaluate */
};
/* ----------- Camre Solver ------------- */
@@ -4449,7 +4449,7 @@ static bConstraintTypeInfo CTI_CAMERASOLVER = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- camerasolver_evaluate /* evaluate */
+ camerasolver_evaluate, /* evaluate */
};
/* ----------- Object Solver ------------- */
@@ -4525,7 +4525,7 @@ static bConstraintTypeInfo CTI_OBJECTSOLVER = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- objectsolver_evaluate /* evaluate */
+ objectsolver_evaluate, /* evaluate */
};
/* ----------- Transform Cache ------------- */
@@ -4616,7 +4616,7 @@ static bConstraintTypeInfo CTI_TRANSFORM_CACHE = {
NULL, /* get constraint targets */
NULL, /* flush constraint targets */
NULL, /* get target matrix */
- transformcache_evaluate /* evaluate */
+ transformcache_evaluate, /* evaluate */
};
/* ************************* Constraints Type-Info *************************** */
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index d7d68b988e3..1486455c750 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -93,7 +93,7 @@ static FModifierTypeInfo FMI_MODNAME = {
fcm_modname_time, /* evaluate time */
fcm_modname_evaluate, /* evaluate */
fcm_modname_time_storage, /* evaluate time with storage */
- fcm_modname_evaluate_storage /* evaluate with storage */
+ fcm_modname_evaluate_storage, /* evaluate with storage */
};
#endif
@@ -246,7 +246,7 @@ static FModifierTypeInfo FMI_GENERATOR = {
NULL, /* evaluate time */
fcm_generator_evaluate, /* evaluate */
NULL, /* evaluate time with storage */
- NULL /* evaluate with storage */
+ NULL, /* evaluate with storage */
};
/* Built-In Function Generator F-Curve Modifier --------------------------- */
@@ -370,7 +370,7 @@ static FModifierTypeInfo FMI_FN_GENERATOR = {
NULL, /* evaluate time */
fcm_fn_generator_evaluate, /* evaluate */
NULL, /* evaluate time with storage */
- NULL /* evaluate with storage */
+ NULL, /* evaluate with storage */
};
/* Envelope F-Curve Modifier --------------------------- */
@@ -479,7 +479,7 @@ static FModifierTypeInfo FMI_ENVELOPE = {
NULL, /* evaluate time */
fcm_envelope_evaluate, /* evaluate */
NULL, /* evaluate time with storage */
- NULL /* evaluate with storage */
+ NULL, /* evaluate with storage */
};
/* exported function for finding points */
@@ -769,7 +769,7 @@ static FModifierTypeInfo FMI_CYCLES = {
NULL, /* evaluate time */
NULL, /* evaluate */
fcm_cycles_time, /* evaluate time with storage */
- fcm_cycles_evaluate /* evaluate with storage */
+ fcm_cycles_evaluate, /* evaluate with storage */
};
/* Noise F-Curve Modifier --------------------------- */
@@ -830,7 +830,7 @@ static FModifierTypeInfo FMI_NOISE = {
NULL, /* evaluate time */
fcm_noise_evaluate, /* evaluate */
NULL, /* evaluate time with storage */
- NULL /* evaluate with storage */
+ NULL, /* evaluate with storage */
};
@@ -887,7 +887,7 @@ static FModifierTypeInfo FMI_PYTHON = {
NULL /*fcm_python_time*/, /* evaluate time */
fcm_python_evaluate, /* evaluate */
NULL, /* evaluate time with storage */
- NULL /* evaluate with storage */
+ NULL, /* evaluate with storage */
};
@@ -932,7 +932,7 @@ static FModifierTypeInfo FMI_LIMITS = {
fcm_limits_time, /* evaluate time */
fcm_limits_evaluate, /* evaluate */
NULL, /* evaluate time with storage */
- NULL /* evaluate with storage */
+ NULL, /* evaluate with storage */
};
/* Stepped F-Curve Modifier --------------------------- */
@@ -987,7 +987,7 @@ static FModifierTypeInfo FMI_STEPPED = {
fcm_stepped_time, /* evaluate time */
NULL, /* evaluate */
NULL, /* evaluate time with storage */
- NULL /* evaluate with storage */
+ NULL, /* evaluate with storage */
};
/* F-Curve Modifier API --------------------------- */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 0205f275f59..101798a40e3 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2115,7 +2115,7 @@ static const char *stamp_metadata_fields[] = {
"RenderTime",
"Memory",
"Hostname",
- NULL
+ NULL,
};
/* Check whether the given metadata field name translates to a known field of
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 09fc7c64d6a..62011513096 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1986,7 +1986,7 @@ bool BKE_pbvh_node_find_nearest_to_ray(
typedef enum {
ISECT_INSIDE,
ISECT_OUTSIDE,
- ISECT_INTERSECT
+ ISECT_INTERSECT,
} PlaneAABBIsect;
/* Adapted from:
diff --git a/source/blender/blenkernel/intern/seqmodifier.c b/source/blender/blenkernel/intern/seqmodifier.c
index 268f554ea88..ce0928f8ff1 100644
--- a/source/blender/blenkernel/intern/seqmodifier.c
+++ b/source/blender/blenkernel/intern/seqmodifier.c
@@ -165,7 +165,7 @@ static SequenceModifierTypeInfo seqModifier_ColorBalance = {
colorBalance_init_data, /* init_data */
NULL, /* free_data */
NULL, /* copy_data */
- colorBalance_apply /* apply */
+ colorBalance_apply, /* apply */
};
/* **** White Balance Modifier **** */
@@ -252,7 +252,7 @@ static SequenceModifierTypeInfo seqModifier_WhiteBalance = {
whiteBalance_init_data, /* init_data */
NULL, /* free_data */
NULL, /* copy_data */
- whiteBalance_apply /* apply */
+ whiteBalance_apply, /* apply */
};
/* **** Curves Modifier **** */
@@ -361,7 +361,7 @@ static SequenceModifierTypeInfo seqModifier_Curves = {
curves_init_data, /* init_data */
curves_free_data, /* free_data */
curves_copy_data, /* copy_data */
- curves_apply /* apply */
+ curves_apply, /* apply */
};
/* **** Hue Correct Modifier **** */
@@ -469,7 +469,7 @@ static SequenceModifierTypeInfo seqModifier_HueCorrect = {
hue_correct_init_data, /* init_data */
hue_correct_free_data, /* free_data */
hue_correct_copy_data, /* copy_data */
- hue_correct_apply /* apply */
+ hue_correct_apply, /* apply */
};
/* **** Bright/Contrast Modifier **** */
@@ -566,7 +566,7 @@ static SequenceModifierTypeInfo seqModifier_BrightContrast = {
NULL, /* init_data */
NULL, /* free_data */
NULL, /* copy_data */
- brightcontrast_apply /* apply */
+ brightcontrast_apply, /* apply */
};
/* **** Mask Modifier **** */
@@ -627,7 +627,7 @@ static SequenceModifierTypeInfo seqModifier_Mask = {
NULL, /* init_data */
NULL, /* free_data */
NULL, /* copy_data */
- maskmodifier_apply /* apply */
+ maskmodifier_apply, /* apply */
};
/* **** Tonemap Modifier **** */
@@ -848,7 +848,7 @@ static SequenceModifierTypeInfo seqModifier_Tonemap = {
tonemapmodifier_init_data, /* init_data */
NULL, /* free_data */
NULL, /* copy_data */
- tonemapmodifier_apply /* apply */
+ tonemapmodifier_apply, /* apply */
};
/*********************** Modifier functions *************************/