[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34088] trunk/blender/source/blender/ editors/animation: Bugfix #25494: Lattice keyframes can' t be selected in dopesheet

[Joshua Leung]

Revision: 34088
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34088
Author:   aligorith
Date:     2011-01-05 09:31:05 +0100 (Wed, 05 Jan 2011)

Log Message:
-----------
Bugfix #25494: Lattice keyframes can't be selected in dopesheet
(summary)

Oops.. missed one place

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

Modified: trunk/blender/source/blender/editors/animation/keyframes_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_draw.c	2011-01-05 07:14:26 UTC (rev 34087)
+++ trunk/blender/source/blender/editors/animation/keyframes_draw.c	2011-01-05 08:31:05 UTC (rev 34088)
@@ -758,6 +758,8 @@
 			
 			/* add material's data */
 			action_to_keylist(ma->adt, ma->adt->action, keys, blocks);
+			
+			// TODO: textures...
 		}
 	}
 	

Modified: trunk/blender/source/blender/editors/animation/keyframes_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_edit.c	2011-01-05 07:14:26 UTC (rev 34087)
+++ trunk/blender/source/blender/editors/animation/keyframes_edit.c	2011-01-05 08:31:05 UTC (rev 34088)
@@ -39,6 +39,7 @@
 #include "DNA_camera_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lamp_types.h"
+#include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
@@ -318,6 +319,16 @@
 			}
 		}
 			break;
+		case OB_LATTICE: /* ---- Lattice ------ */
+		{
+			Lattice *lt= (Lattice *)ob->data;
+			
+			if ((lt->adt) && !(filterflag & ADS_FILTER_NOLAT)) {
+				if (adt_keyframes_loop(ked, lt->adt, key_ok, key_cb, fcu_cb, filterflag))
+					return 1;
+			}
+		}
+			break;
 	}
 	
 	/* Add Particle System Keyframes */