diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-04-17 06:13:35 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-04-17 06:13:35 +0400 |
| commit | 7cb8b3910d901ca03d675673728b22fe647e6838 (patch) | |
| tree | f8bb8654194c7390ae509ab5e4c59a3b7821728c /source/blender/editors/animation | |
| parent | 6386186d25373adc89b597928478f1828cda0564 (diff) | |
2.5 Animation UI Tweaks:
* Added back backgrounds behind buttons for modifiers and driver targets
* 'Protect' toggle doesn't draw for F-Curves with no keyframes to prevent editing on anymore
* Inserting keyframes on objects using builtin keyingsets now use the right names
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyingsets.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels.c b/source/blender/editors/animation/anim_channels.c index e0f760542d9..9e0e50a8de5 100644 --- a/source/blender/editors/animation/anim_channels.c +++ b/source/blender/editors/animation/anim_channels.c @@ -1494,8 +1494,9 @@ static void mouse_anim_channels (bAnimContext *ac, float x, int channel_index, s offset = 0; if (x >= (ACHANNEL_NAMEWIDTH-ACHANNEL_BUTTON_WIDTH)) { - /* toggle protection */ - fcu->flag ^= FCURVE_PROTECTED; + /* toggle protection (only if there's a toggle there) */ + if (fcu->bezt) + fcu->flag ^= FCURVE_PROTECTED; } else if (x >= (ACHANNEL_NAMEWIDTH-2*ACHANNEL_BUTTON_WIDTH)) { /* toggle mute */ diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 02b7980f0c4..adc0b744d53 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -1077,7 +1077,7 @@ int modify_keyframes (bContext *C, ListBase *dsources, bAction *act, KeyingSet * int arraylen, i; /* set initial group name */ - groupname= (cks->id) ? cks->id->name : NULL; + groupname= (cks->id) ? cks->id->name+2 : NULL; /* construct the path */ // FIXME: this currently only works with a few hardcoded cases |