diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-12-07 13:50:02 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-12-07 13:50:02 +0300 |
| commit | be7192c0bd161a3b4a3ef28eca60fcc12730d986 (patch) | |
| tree | e3653785205be9e124e527c56e4e32d22915ab27 /source/blender/src/header_nla.c | |
| parent | 9723e3ef39d0a0c8b7a47f145c52982481109f2f (diff) | |
== NLA - Scale Related Fixes ==
* Old files now get initialised with the correct scale. The wrong calculation was being used
* Added a new tool to Alt-S menu: "Apply Scale"
This tool causes all the keyframes in the active strip to be moved to their NLA-scaled times, the scale to be set to 1.0, and the frame ranges recalculated accordingly (to remove any nasty weird errors)
* Scale field now draws red when the action-range is < 1, and the tooltip in this case instructs the user how to fix this (by using "Apply Scale").
Diffstat (limited to 'source/blender/src/header_nla.c')
| -rw-r--r-- | source/blender/src/header_nla.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/src/header_nla.c b/source/blender/src/header_nla.c index 96ea6c3d792..3b614ebfb7c 100644 --- a/source/blender/src/header_nla.c +++ b/source/blender/src/header_nla.c @@ -331,7 +331,7 @@ static void do_nla_stripmenu(void *arg, int event) case 7: /* Move Down */ shift_nlastrips_down(); break; - case 8: /* size */ + case 8: /* reset scale */ reset_action_strips(1); break; case 9: /* reset start/end of action */ @@ -340,6 +340,9 @@ static void do_nla_stripmenu(void *arg, int event) case 10: /* add new action as new action strip */ add_empty_nlablock(); break; + case 11: /* apply scale */ + reset_action_strips(3); + break; } } @@ -353,10 +356,11 @@ static uiBlock *nla_stripmenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Strip Properties...|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBlockBut(block, nla_strip_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 20, ""); - uiDefIconTextBlockBut(block, nla_strip_snapmenu, NULL, ICON_RIGHTARROW_THIN, "Snap To Frame", 0, yco-=20, 120, 20, ""); + uiDefIconTextBlockBut(block, nla_strip_snapmenu, NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 20, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Strip Size|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Strip Scale|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Action Start/End|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Strip Scaling|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); |