[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17396] branches/animsys2/source/blender/ src/drawaction.c: AnimSys2: DopeSheet - Shapekeys bugfix

[Joshua Leung]

Revision: 17396
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17396
Author:   aligorith
Date:     2008-11-11 03:08:17 +0100 (Tue, 11 Nov 2008)

Log Message:
-----------
AnimSys2: DopeSheet - Shapekeys bugfix

Shapekey keyframes didn't show up in the 'object' summary channels

Modified Paths:
--------------
    branches/animsys2/source/blender/src/drawaction.c

Modified: branches/animsys2/source/blender/src/drawaction.c
===================================================================
--- branches/animsys2/source/blender/src/drawaction.c	2008-11-11 01:50:26 UTC (rev 17395)
+++ branches/animsys2/source/blender/src/drawaction.c	2008-11-11 02:08:17 UTC (rev 17396)
@@ -1893,6 +1893,7 @@
 void ob_to_keylist(Object *ob, ListBase *keys, ListBase *blocks, ActKeysInc *aki)
 {
 	bConstraintChannel *conchan;
+	Key *key= ob_get_key(ob);
 
 	if (ob) {
 		/* Add object keyframes */
@@ -1903,6 +1904,10 @@
 		if (ob->action)
 			action_to_keylist(ob->action, keys, blocks, aki);
 		
+		/* Add shapekey keyframes */
+		if (key && key->ipo)
+			ipo_to_keylist(key->ipo, keys, blocks, aki);
+		
 		/* Add constraint keyframes */
 		for (conchan=ob->constraintChannels.first; conchan; conchan=conchan->next) {
 			if (conchan->ipo)