diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 13:11:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 13:11:55 +0300 |
commit | f06884b18ab5b619975689a0670f8f0f14f9c318 (patch) | |
tree | e0c0f557659f6b900019acd5c1f11e127619e539 /source/blender/gpencil_modifiers/intern | |
parent | b2193e020bc0c1a9ef9969440ece453e49f8012c (diff) |
Cleanup: style, duplicate includes
Diffstat (limited to 'source/blender/gpencil_modifiers/intern')
16 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c index 97d28863095..664f4b6976c 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c @@ -23,7 +23,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/modifiers/intern/MOD_gpencil_util.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencil_util.c * \ingroup bke */ diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h index 50ac557042d..39a4947573e 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/modifiers/intern/MOD_gpencil_util.h +/** \file blender/gpencil_modifiers/intern/MOD_gpencil_util.h * \ingroup modifiers */ diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c index 6b959659a60..945afec002d 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilbuild.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilbuild.c * \ingroup modifiers */ @@ -519,7 +519,7 @@ static void generateStrokes( */ #if 0 static void bakeModifier( - Main *bmain, const Depsgraph *UNUSED(depsgraph), + Main *bmain, const Depsgraph *UNUSED(depsgraph), GpencilModifierData *md, Object *ob) { bGPdata *gpd = ob->data; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index af00b24715f..3cd298e9b87 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilcolor.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilcolor.c * \ingroup modifiers */ @@ -98,7 +98,7 @@ static void deformStroke( } static void bakeModifier( - Main *bmain, Depsgraph *depsgraph, + Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { ColorGpencilModifierData *mmd = (ColorGpencilModifierData *)md; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index e036b6b78be..40e5e718bdc 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilhook.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilhook.c * \ingroup modifiers */ @@ -265,7 +265,7 @@ static void deformStroke( * (i.e. one where we don't have to worry about restoring state) */ static void bakeModifier( - Main *bmain, Depsgraph *depsgraph, + Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { HookGpencilModifierData *mmd = (HookGpencilModifierData *)md; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c index 64f3fbc4a95..a35174d882f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilinstance.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilinstance.c * \ingroup modifiers */ @@ -320,7 +320,7 @@ static void generateStrokes( /* Generic "bakeModifier" callback */ static void bakeModifier( - Main *bmain, Depsgraph *depsgraph, + Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { InstanceGpencilModifierData *mmd = (InstanceGpencilModifierData *)md; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index 944e787020e..c4ff44af927 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencillattice.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencillattice.c * \ingroup modifiers */ @@ -111,7 +111,7 @@ static void deformStroke( * (i.e. one where we don't have to worry about restoring state) */ static void bakeModifier( - Main *bmain, Depsgraph *depsgraph, + Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index 9b5186755d6..afecdd34a5c 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilmirror.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilmirror.c * \ingroup modifiers */ @@ -142,9 +142,9 @@ static void generateStrokes( tot_strokes = BLI_listbase_count(&gpf->strokes); for (i = 0, gps = gpf->strokes.first; i < tot_strokes; i++, gps = gps->next) { - if (is_stroke_affected_by_modifier(ob, - mmd->layername, mmd->pass_index, 1, gpl, gps, - mmd->flag & GP_MIRROR_INVERT_LAYER, mmd->flag & GP_MIRROR_INVERT_PASS)) + if (is_stroke_affected_by_modifier( + ob, mmd->layername, mmd->pass_index, 1, gpl, gps, + mmd->flag & GP_MIRROR_INVERT_LAYER, mmd->flag & GP_MIRROR_INVERT_PASS)) { /* check each axis for mirroring */ for (int xi = 0; xi < 3; ++xi) { @@ -162,7 +162,7 @@ static void generateStrokes( } static void bakeModifier( - Main *bmain, Depsgraph *depsgraph, + Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { MirrorGpencilModifierData *mmd = (MirrorGpencilModifierData *)md; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index 37c8bf0b0f0..1edcaf84b81 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilnoise.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilnoise.c * \ingroup modifiers */ diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index 8a96c705f08..50ff3f8766a 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpenciloffset.c +/** \file blender/gpencil_modifiers/intern/MOD_gpenciloffset.c * \ingroup modifiers */ @@ -105,7 +105,7 @@ static void deformStroke( } static void bakeModifier( - struct Main *UNUSED(bmain), Depsgraph *depsgraph, + struct Main *UNUSED(bmain), Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { bGPdata *gpd = ob->data; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index bdd651a69fc..361668f8725 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilopacity.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilopacity.c * \ingroup modifiers */ @@ -81,7 +81,7 @@ static void deformStroke( return; } - gp_style->fill_rgba[3]*= mmd->factor; + gp_style->fill_rgba[3] *= mmd->factor; /* if factor is > 1, then force opacity */ if (mmd->factor > 1.0f) { @@ -133,7 +133,7 @@ static void deformStroke( } static void bakeModifier( - struct Main *UNUSED(bmain), Depsgraph *depsgraph, + struct Main *UNUSED(bmain), Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { bGPdata *gpd = ob->data; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c index f0400e39b73..a8d10c973ce 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c @@ -23,7 +23,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilsimplify.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c * \ingroup modifiers */ @@ -85,7 +85,7 @@ static void deformStroke( } static void bakeModifier( - struct Main *UNUSED(bmain), Depsgraph *depsgraph, + struct Main *UNUSED(bmain), Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { bGPdata *gpd = ob->data; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c index b83c8ed98b1..182bd974959 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilsmooth.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c * \ingroup modifiers */ @@ -114,7 +114,7 @@ static void deformStroke( } static void bakeModifier( - struct Main *UNUSED(bmain), Depsgraph *depsgraph, + struct Main *UNUSED(bmain), Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { bGPdata *gpd = ob->data; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c index 6fe9c34c06b..dba3e028904 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilsubdiv.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c * \ingroup modifiers */ @@ -155,7 +155,7 @@ static void deformStroke( } static void bakeModifier( - struct Main *UNUSED(bmain), Depsgraph *depsgraph, + struct Main *UNUSED(bmain), Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { bGPdata *gpd = ob->data; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 118cc33255f..fb63aa31364 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpencilthick.c +/** \file blender/gpencil_modifiers/intern/MOD_gpencilthick.c * \ingroup modifiers */ @@ -133,7 +133,7 @@ static void deformStroke( } static void bakeModifier( - struct Main *UNUSED(bmain), Depsgraph *depsgraph, + struct Main *UNUSED(bmain), Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { bGPdata *gpd = ob->data; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index 9d1e9eccb8c..859e12adfb5 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -24,7 +24,7 @@ * */ -/** \file blender/modifiers/intern/MOD_gpenciltint.c +/** \file blender/gpencil_modifiers/intern/MOD_gpenciltint.c * \ingroup modifiers */ @@ -106,7 +106,7 @@ static void deformStroke( } static void bakeModifier( - Main *bmain, Depsgraph *depsgraph, + Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob) { TintGpencilModifierData *mmd = (TintGpencilModifierData *)md; |