From bba4a09b2f0b73f0a38e1eccc403a4cef536f703 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Mar 2020 12:50:56 +1100 Subject: Cleanup: use 'BKE_' prefix for BKE_deform API calls - Use 'BKE_object_defgroup' prefix for object functions. - Rename 'defvert_verify_index' to 'defvert_ensure_index' since this adds the group if it isn't found. --- source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/gpencil_modifiers/intern') diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c index 5069a9aa1cb..6f37cedba49 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c @@ -158,7 +158,7 @@ float get_modifier_point_weight(MDeformVert *dvert, bool inverse, int def_nr) float weight = 1.0f; if ((dvert != NULL) && (def_nr != -1)) { - MDeformWeight *dw = defvert_find_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dvert, def_nr); weight = dw ? dw->weight : -1.0f; if ((weight >= 0.0f) && (inverse == 1)) { return -1.0f; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index 132d86a87c8..5a9dc78829f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -199,7 +199,7 @@ static void deformStroke(GpencilModifierData *md, return; } - const int def_nr = defgroup_name_index(ob, mmd->vgname); + const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname); bPoseChannel *pchan = BKE_pose_channel_find_name(mmd->object->pose, mmd->subtarget); float dmat[4][4]; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index 9286fcfff56..dba554fec36 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -75,7 +75,7 @@ static void deformStroke(GpencilModifierData *md, bGPDstroke *gps) { LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md; - const int def_nr = defgroup_name_index(ob, mmd->vgname); + const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname); if (!is_stroke_affected_by_modifier(ob, mmd->layername, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index f34477aaab2..157bd536609 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -88,7 +88,7 @@ static void deformStroke(GpencilModifierData *md, float vec1[3], vec2[3]; int sc_frame = 0; int stroke_seed = 0; - const int def_nr = defgroup_name_index(ob, mmd->vgname); + const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname); const float unit_v3[3] = {1.0f, 1.0f, 1.0f}; if (!is_stroke_affected_by_modifier(ob, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index 70d463fff76..0979a2d90c9 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -69,7 +69,7 @@ static void deformStroke(GpencilModifierData *md, bGPDstroke *gps) { OffsetGpencilModifierData *mmd = (OffsetGpencilModifierData *)md; - const int def_nr = defgroup_name_index(ob, mmd->vgname); + const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname); float mat[4][4]; float loc[3], rot[3], scale[3]; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index b0fab5e8d69..9647489358e 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -72,7 +72,7 @@ static void deformStroke(GpencilModifierData *md, bGPDstroke *gps) { OpacityGpencilModifierData *mmd = (OpacityGpencilModifierData *)md; - const int def_nr = defgroup_name_index(ob, mmd->vgname); + const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname); if (!is_stroke_affected_by_modifier(ob, mmd->layername, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c index 68060711681..b6b5bf05a9d 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c @@ -65,7 +65,7 @@ static void deformStroke(GpencilModifierData *md, bGPDstroke *gps) { SmoothGpencilModifierData *mmd = (SmoothGpencilModifierData *)md; - const int def_nr = defgroup_name_index(ob, mmd->vgname); + const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname); if (!is_stroke_affected_by_modifier(ob, mmd->layername, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 036464e718d..694b932a6bf 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -88,7 +88,7 @@ static void deformStroke(GpencilModifierData *md, bGPDstroke *gps) { ThickGpencilModifierData *mmd = (ThickGpencilModifierData *)md; - const int def_nr = defgroup_name_index(ob, mmd->vgname); + const int def_nr = BKE_object_defgroup_name_index(ob, mmd->vgname); if (!is_stroke_affected_by_modifier(ob, mmd->layername, -- cgit v1.2.3