[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46342] trunk/blender/source/blender/ editors/animation/anim_filter.c: Bugfix [#31330] Shape Key Editor does not switch to assigned Key Action

[Joshua Leung]

Revision: 46342
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46342
Author:   aligorith
Date:     2012-05-06 09:41:38 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Bugfix [#31330] Shape Key Editor does not switch to assigned Key Action

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_filter.c

Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c	2012-05-06 07:59:37 UTC (rev 46341)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2012-05-06 09:41:38 UTC (rev 46342)
@@ -137,7 +137,7 @@
 				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 @@
 			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;