diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:21:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:22:03 +0300 |
commit | 4dc91ebf81438c473bbd8f9a1655179335c6d42f (patch) | |
tree | bf254664e6ffcec5e2a4f12417e5a6f0779c4f7e /source/blender/modifiers/intern/MOD_weightvg_util.c | |
parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvg_util.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvg_util.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index c309bb8dbce..3d7c4bc24d8 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -115,10 +115,11 @@ void weightvg_do_map(int num, float *new_w, short falloff_type, CurveMapping *cm * vertex index (in case the weight tables do not cover the whole vertices...). * XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear. */ -void weightvg_do_mask(const int num, const int *indices, float *org_w, const float *new_w, - Object *ob, Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME], - Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping, - Object *tex_map_object, const char *tex_uvlayer_name) +void weightvg_do_mask( + const int num, const int *indices, float *org_w, const float *new_w, + Object *ob, Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME], + Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping, + Object *tex_map_object, const char *tex_uvlayer_name) { int ref_didx; int i; @@ -238,9 +239,10 @@ void weightvg_do_mask(const int num, const int *indices, float *org_w, const flo * If indices is not NULL, it must be an array of same length as weights, mapping to the real * vertex index (in case the weight array does not cover the whole vertices...). */ -void weightvg_update_vg(MDeformVert *dvert, int defgrp_idx, MDeformWeight **dws, int num, - const int *indices, const float *weights, const bool do_add, - const float add_thresh, const bool do_rem, const float rem_thresh) +void weightvg_update_vg( + MDeformVert *dvert, int defgrp_idx, MDeformWeight **dws, int num, + const int *indices, const float *weights, const bool do_add, + const float add_thresh, const bool do_rem, const float rem_thresh) { int i; |