diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-05-30 14:41:41 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-05-30 14:41:41 +0400 |
commit | 32d0533f78c63d5d95b693e1e6e65144203dc42a (patch) | |
tree | b602e71ceb4f7a9fbfbaeba97585da8c3c6eac0e /source/blender/editors/space_nla/nla_edit.c | |
parent | 72205f45e4e4dfd14460d693ccda30f7677ae9be (diff) |
NLA SoC: More UI work + 'Push down' tool
'UI Work'
* Added more drawing code for drawing NLA data
* Made the operators for the 'channel-list' of NLA work. A special version of borderselect for the NLA channel-list (due to the different vertical order) still needs to be coded though.
'Push Down' tool
The active action of each AnimData block, represented by the reddy/orange channel, can be added to the NLA stack as a new action by using the 'snow-flake' icon/button (probably need a special icon for this later). This will add a new NLA track and an NLA strip referencing this action. The AnimData block's 'active action' slot will then be left empty.
(Unfortunately, there still seems to be a bug here, which I'll check on later)
Diffstat (limited to 'source/blender/editors/space_nla/nla_edit.c')
-rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index d9d0e5528ae..ce9ae7de7a9 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -51,10 +51,12 @@ #include "BKE_screen.h" #include "ED_anim_api.h" +#include "ED_markers.h" #include "ED_space_api.h" #include "ED_screen.h" -#include "BIF_gl.h" +#include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" @@ -63,13 +65,10 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_markers.h" - #include "nla_intern.h" // own include /* *********************************************** */ - /* *********************************************** */ /* *********************************************** */ |