diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-01-10 22:34:23 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-01-10 22:34:23 +0300 |
| commit | 1beef956ca96c76e3ee7d6ba80d0c88e2b92b258 (patch) | |
| tree | c6c52bf29ac8ef8278d4061761a6e91f1b0f4c88 /source/blender/editors/armature | |
| parent | 3c2b772a23728361b060a406528f6f2a422a278f (diff) | |
2.5
Instead of many commits, here 1!
- Constraint edit code back
- Removed XXX stubs for constraints
(make parent follow path works)
- Removed XXX stubs for armature
(make parent deform, do center, etc works)
- Found a bad uninitialized global Scene * in code, especially
in kernel it wreaked havoc.
- added missing include in blenkernel/brush.c
- fixed Nicholas' fix for editmode subsurf crash
(It needed to check for editmode)
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 99f89d84328..bc4f39d8a23 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -3856,7 +3856,7 @@ void add_verts_to_dgroups(Scene *scene, Object *ob, Object *par, int heat, int m * when parenting, or simply the original mesh coords. */ - bArmature *arm= ob->data; + bArmature *arm= par->data; Bone **bonelist, *bone; bDeformGroup **dgrouplist, **dgroupflip; bDeformGroup *dgroup, *curdg; @@ -4020,7 +4020,7 @@ void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par) /* Lets try to create some vertex groups * based on the bones of the parent armature. */ - bArmature *arm= ob->data; + bArmature *arm= par->data; short mode; /* Prompt the user on whether/how they want the vertex groups @@ -4030,6 +4030,9 @@ void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par) "Name Groups %x2|" "Create From Envelopes %x3|" "Create From Bone Heat %x4|"); + + mode= 3; // XXX + switch (mode) { case 2: /* Traverse the bone list, trying to create empty vertex |