diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-12-13 13:55:10 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-12-13 13:55:10 +0300 |
| commit | 8e81daa8bc09b5c2ef7c9d26b6c9bc8628d38f02 (patch) | |
| tree | 8067e1465416d11c9b5a0db3d77c5dbec650da69 /source/blender/src/space.c | |
| parent | ac09c432e0000cba5114c29fb11ba0d7f198f62c (diff) | |
== 2 New Rigging Tools ==
This commit introduces two (currently only one is actually functional) new features for working with armatures.
* Bone Merging (Alt-M)
It is now possible to select a bunch of linked bones and "merge" them together. Currently, there's only one option to merge bones that are selected and linked to each other in a chain.
* Add Bone Between Joints (FKEY)
This allows you to select a few joints, and have a bone created between them. Currently, this is not yet functional (but the code is there)
Diffstat (limited to 'source/blender/src/space.c')
| -rw-r--r-- | source/blender/src/space.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 984c1e65feb..2e560b05228 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1897,7 +1897,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) addsegment_nurb(); } else if(G.obedit->type == OB_ARMATURE) { - //fill_bones_armature(); + fill_bones_armature(); } } else if(G.qual==LR_CTRLKEY) @@ -2161,12 +2161,12 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) pose_movetolayer(); } else if (G.qual==LR_ALTKEY) { - if(G.obedit->type==OB_MESH) { + if (G.obedit->type == OB_MESH) { mergemenu(); DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); } - else if (G.obedit == OB_ARMATURE) { - //merge_armature(); + else if (G.obedit->type == OB_ARMATURE) { + merge_armature(); } } else if ((G.qual==0) || (G.qual==LR_CTRLKEY)) { |