diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-26 14:11:53 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-26 14:11:53 +0300 |
| commit | 26d8b598649d25cf352adab03111e623adacea48 (patch) | |
| tree | 34543e721140b5ec733e12eba80d2bf9ed69111e /source/blender/editors/armature | |
| parent | 5a1603374c768d7a9c7d9cb4b05ca4098ca32537 (diff) | |
Assign automatic/envelope weights in weight paint mode is back,
accessible from W key and in new Weights menu in the header.
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/poseobject.c | 25 |
2 files changed, 2 insertions, 27 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 992ca8909c1..b2e193ebf71 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4774,7 +4774,7 @@ void add_verts_to_dgroups(Scene *scene, Object *ob, Object *par, int heat, int m MEM_freeN(verts); } -void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par, int mode) +void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par, int mode, int mirror) { /* Lets try to create some vertex groups * based on the bones of the parent armature. @@ -4795,7 +4795,7 @@ void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par, int mod * that are populated with the vertices for which the * bone is closest. */ - add_verts_to_dgroups(scene, ob, par, (mode == ARM_GROUPS_AUTO), 0); + add_verts_to_dgroups(scene, ob, par, (mode == ARM_GROUPS_AUTO), mirror); } } /* ************* Clear Pose *****************************/ diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 1e94817100c..e4fb378aff2 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -1115,31 +1115,6 @@ void POSE_OT_paste (wmOperatorType *ot) /* ********************************************** */ -/* context weightpaint and deformer in posemode */ -void pose_adds_vgroups(Scene *scene, Object *meshobj, int heatweights) -{ -// XXX extern VPaint Gwp; /* from vpaint */ - Object *poseobj= modifiers_isDeformedByArmature(meshobj); - - if(poseobj==NULL || (poseobj->mode & OB_MODE_POSE)==0) { - error("The active object must have a deforming armature in pose mode"); - return; - } - -// XXX add_verts_to_dgroups(meshobj, poseobj, heatweights, ((Mesh *)(meshobj->data))->editflag & ME_EDIT_MIRROR_X); - - if(heatweights) - BIF_undo_push("Apply Bone Heat Weights to Vertex Groups"); - else - BIF_undo_push("Apply Bone Envelopes to Vertex Groups"); - - - // and all its relations - DAG_id_flush_update(&meshobj->id, OB_RECALC_DATA); -} - -/* ********************************************** */ - static int pose_group_add_exec (bContext *C, wmOperator *op) { |