diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-07-07 09:41:59 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-07-07 09:41:59 +0400 |
commit | 2edef129be18fa8cb7d9c33b8bd76dc60d9e1dcf (patch) | |
tree | 8a4c2ee2b23eb85780dd3fe06824f1dfc7abb29a /source/blender/editors/space_nla | |
parent | 905b1380054f42fe30b19fb37861057af4760e32 (diff) |
NLA SoC: Transform Code for NLA-Strips recoded (still buggy)
Recoded the Transform code for NLA-Strips so that they can now be moved between strips and will not get truncated when they get moved into other non-moving strips.
Todos:
* The current code for moving strips between tracks is buggy (only goes up, and has a tendency to move up without being told to)
* Auto-snapping doesn't work yet...
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/nla_header.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_intern.h | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c index 9b9b21629cc..9a2806ed9c1 100644 --- a/source/blender/editors/space_nla/nla_header.c +++ b/source/blender/editors/space_nla/nla_header.c @@ -139,7 +139,7 @@ static void nla_selectmenu(bContext *C, uiLayout *layout, void *arg_unused) static void nla_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unused) { // XXX these operators may change for NLA... - uiItemEnumO(layout, "Grab/Move", 0, "TFM_OT_transform", "mode", TFM_TIME_TRANSLATE); + uiItemEnumO(layout, "Grab/Move", 0, "TFM_OT_transform", "mode", TFM_TRANSLATION); uiItemEnumO(layout, "Extend", 0, "TFM_OT_transform", "mode", TFM_TIME_EXTEND); uiItemEnumO(layout, "Scale", 0, "TFM_OT_transform", "mode", TFM_TIME_SCALE); } diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h index 4391a019207..3d8bfcd0546 100644 --- a/source/blender/editors/space_nla/nla_intern.h +++ b/source/blender/editors/space_nla/nla_intern.h @@ -33,21 +33,6 @@ /* **************************************** */ /* Macros, etc. only used by NLA */ -/* -------------- NLA Channel Defines -------------- */ - -/* NLA channel heights */ -#define NLACHANNEL_FIRST -16 -#define NLACHANNEL_HEIGHT 24 -#define NLACHANNEL_HEIGHT_HALF 12 -#define NLACHANNEL_SKIP 2 -#define NLACHANNEL_STEP (NLACHANNEL_HEIGHT + NLACHANNEL_SKIP) - -/* channel widths */ -#define NLACHANNEL_NAMEWIDTH 200 - -/* channel toggle-buttons */ -#define NLACHANNEL_BUTTON_WIDTH 16 - /* **************************************** */ /* space_nla.c / nla_buttons.c */ |