Bugfix [#31330] Shape Key Editor does not switch to assigned Key Action
authorJoshua Leung <aligorith@gmail.com>
Sun, 6 May 2012 09:41:38 +0000 (09:41 +0000)
committerJoshua Leung <aligorith@gmail.com>
Sun, 6 May 2012 09:41:38 +0000 (09:41 +0000)
source/blender/editors/animation/anim_filter.c

index 180953ea017a84858f20c3580c836fcb58ba4bb0..2f0f396eb1049cfd5385dfaed1f5039034664fcc 100644 (file)
@@ -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;