diff options
author | Ton Roosendaal <ton@blender.org> | 2004-11-11 16:17:32 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-11-11 16:17:32 +0300 |
commit | 2e4a10253b8f96b631eee8af5e1e711f372612ae (patch) | |
tree | f7ac4c363e22d2085397ca9410acdceb424c5476 /source/blender/src/header_nla.c | |
parent | 11fe49227b8b3dbcc6dbafbde16ee84c1a2e5af7 (diff) |
Fix for bug #1756
This was caused by a very primitive method of interpolating quaternions.
It was converting quats to mat and back to quat, and then just doing
a linear interpolation. That whilst quaternions are renowned for having
good interpolation possible.
I've experimented with 2 quaternion interpolation methods, and can only
get one to work correctly... the "official" version from Watt brothers
I can't get working, both are in arithb.c now.
Will arrange *close* review with experienced NLAers for it! But testing
here gives fully predictable results.
Also changed;
- added pointer check in drawaction
- changed puldown menu for correct hotkeys for move NLA strips up/down
Diffstat (limited to 'source/blender/src/header_nla.c')
-rw-r--r-- | source/blender/src/header_nla.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/header_nla.c b/source/blender/src/header_nla.c index 332c0bece86..cdf2763eeab 100644 --- a/source/blender/src/header_nla.c +++ b/source/blender/src/header_nla.c @@ -289,8 +289,8 @@ static uiBlock *nla_stripmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Up|NumPad -", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Down|NumPad +", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Up|Page Down", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Down|Page Up", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, ""); // uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Convert Action to NLA Strip|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, ""); |