diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
commit | 9e2ea6c500a3a5774a1aa174b6801d3a9edadd9a (patch) | |
tree | 25e8fd41033e82b6cb04a00b52390f899dc085e5 /source/blender/editors/armature/armature_skinning.c | |
parent | f3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689 (diff) | |
parent | 0f2efce6c50718d7745a6dc1613acf62a186cc05 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/armature_skinning.c')
-rw-r--r-- | source/blender/editors/armature/armature_skinning.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 5c8e08a0d89..e25056a7a4a 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -431,7 +431,7 @@ static void add_verts_to_dgroups( MEM_freeN(verts); } -void create_vgroups_from_armature( +void ED_object_vgroup_calc_from_armature( ReportList *reports, const EvaluationContext *eval_ctx, Scene *scene, Object *ob, Object *par, const int mode, const bool mirror) { |