diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-01-22 06:16:48 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-01-22 06:16:48 +0300 |
commit | d23bcd8b7f51d741804bd435f8bb2d7d7afee94e (patch) | |
tree | ff4e9f874c448fa0b0b58a79364c55afec86f90c /source/blender/src/editaction.c | |
parent | be95e6b0cae6c034cf27b509c348df6119fe0bd5 (diff) |
== Action/Bone Groups - Ctrl-G Hotkey + Bugfixes ==
New Stuff:
* When in PoseMode, the Ctrl-G hotkey now presents a menu with options for manipulating Bone Groups. There are options to add/remove all selected bones from a certain group.
TODO - add appropriate entries to menus
Bugfixes:
* Renaming Bone-Groups in the buttons panel could cause segfaults or memory corruption. Wrong maximum-length for button used here (it's far too easy to miss).
* In the Action Editor, (re)grouping channels didn't take into account whether a group was expanded or not. This meant that selected channels from inside a collapsed group got added to the new group too.
Diffstat (limited to 'source/blender/src/editaction.c')
-rw-r--r-- | source/blender/src/editaction.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index ab647444a20..95192e42a5d 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -981,12 +981,14 @@ void action_groups_group (short add_group) /* make sure not already in new-group */ if (achan->grp != agrp) { - if (VISIBLE_ACHAN(achan) && SEL_ACHAN(achan)) { - /* unlink from everything else */ - action_groups_removeachan(act, achan); - - /* add to end of group's channels */ - action_groups_addachan(act, agrp, achan); + if ((achan->grp) && (EXPANDED_AGRP(achan->grp))) { + if (VISIBLE_ACHAN(achan) && SEL_ACHAN(achan)) { + /* unlink from everything else */ + action_groups_removeachan(act, achan); + + /* add to end of group's channels */ + action_groups_addachan(act, agrp, achan); + } } } } |