diff options
author | Joshua Leung <aligorith@gmail.com> | 2012-05-06 13:41:38 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2012-05-06 13:41:38 +0400 |
commit | 1755dc74773cfeee5ca190410b9cc6393c093009 (patch) | |
tree | d09f7297209e4f46207892ce35a8a6adde04a78a /source/blender | |
parent | b65cc42145f8f32b165fa46b799a6d7081c15957 (diff) |
Bugfix [#31330] Shape Key Editor does not switch to assigned Key Action
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 180953ea017..2f0f396eb10 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -137,7 +137,7 @@ static short actedit_get_context (bAnimContext *ac, SpaceAction *saction) if (ac->obact && ac->obact->adt) saction->action = ac->obact->adt->action; else - saction->action= NULL; + saction->action = NULL; } ac->datatype= ANIMCONT_ACTION; @@ -150,6 +150,16 @@ static short actedit_get_context (bAnimContext *ac, SpaceAction *saction) ac->datatype= ANIMCONT_SHAPEKEY; ac->data= actedit_get_shapekeys(ac); + /* if not pinned, sync with active object */ + if (/*saction->pin == 0*/1) { + Key *key = (Key *)ac->data; + + if (key && key->adt) + saction->action = key->adt->action; + else + saction->action = NULL; + } + ac->mode= saction->mode; return 1; |