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-08-08 19:02:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-08 19:02:32 +0300
commit1eead85cdc2789728bdb7bd4c99b29bf0d2f046c (patch)
tree9f621f694729a101f2651cc6a43c075a8c154aaf
parent47cd57eedc337b6a5757e8765086ef8ab2479f76 (diff)
Cleanup: remove function already implemented in BKE_deform
-rw-r--r--source/blender/blenkernel/intern/gpencil.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 01cdd53bd6b..6fea938edc7 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1460,27 +1460,16 @@ static MDeformVert *stroke_defvert_new_count(int count, int totweight, ListBase
return dst;
}
-static float stroke_defvert_get_nr_weight(MDeformVert *dv, int def_nr)
-{
- int i;
- for (i = 0; i < dv->totweight; i++) {
- if (dv->dw[i].def_nr == def_nr) {
- return dv->dw[i].weight;
- }
- }
- return 0.0f;
-}
-
static void stroke_interpolate_deform_weights(
bGPDstroke *gps, int index_from, int index_to, float ratio, MDeformVert *vert)
{
- MDeformVert *vl = &gps->dvert[index_from];
- MDeformVert *vr = &gps->dvert[index_to];
+ const MDeformVert *vl = &gps->dvert[index_from];
+ const MDeformVert *vr = &gps->dvert[index_to];
int i;
for (i = 0; i < vert->totweight; i++) {
- float wl = stroke_defvert_get_nr_weight(vl, vert->dw[i].def_nr);
- float wr = stroke_defvert_get_nr_weight(vr, vert->dw[i].def_nr);
+ float wl = defvert_find_weight(vl, vert->dw[i].def_nr);
+ float wr = defvert_find_weight(vr, vert->dw[i].def_nr);
vert->dw[i].weight = interpf(wr, wl, ratio);
}
}