diff options
author | Joshua Leung <aligorith@gmail.com> | 2011-01-05 11:31:05 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2011-01-05 11:31:05 +0300 |
commit | c8f0404f53259f6ded382a3b46a3cf23056b2af5 (patch) | |
tree | a593f231c065e04e76fc8bef4e22dcd4db6da085 /source/blender/editors | |
parent | 998b789138ff12b249c798b3205721d37babbe7a (diff) |
Bugfix #25494: Lattice keyframes can't be selected in dopesheet
(summary)
Oops.. missed one place
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframes_edit.c | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index aefb853cc5f..834a1028c6a 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -758,6 +758,8 @@ void ob_to_keylist(bDopeSheet *ads, Object *ob, DLRBT_Tree *keys, DLRBT_Tree *bl /* add material's data */ action_to_keylist(ma->adt, ma->adt->action, keys, blocks); + + // TODO: textures... } } diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 0958b4870b5..d675bf673cd 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -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 @@ static short ob_keyframes_loop(KeyframeEditData *ked, Object *ob, KeyframeEditFu } } 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 */ |