[Bf-blender-cvs] [1eead85cdc2] master: Cleanup: remove function already implemented in BKE_deform
Campbell Barton
noreply at git.blender.org
Thu Aug 8 18:04:11 CEST 2019
Commit: 1eead85cdc2789728bdb7bd4c99b29bf0d2f046c
Author: Campbell Barton
Date: Fri Aug 9 02:02:32 2019 +1000
Branches: master
https://developer.blender.org/rB1eead85cdc2789728bdb7bd4c99b29bf0d2f046c
Cleanup: remove function already implemented in BKE_deform
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
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);
}
}
More information about the Bf-blender-cvs
mailing list