diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-03 11:46:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-03 11:46:14 +0300 |
| commit | c31536fc534156559fb19d008323b28a3dc4ef5f (patch) | |
| tree | bbc8f34f48345a3287d1305a316a97db454b447f /source/blender/blenkernel/intern/nla.c | |
| parent | fe8d5b81b09462d2344a50b32bfd2d8df5c6d886 (diff) | |
bugfix [#24445] NLA reverse option flickers
UnMapping the reversed NLA strips timing was incorrect.
Diffstat (limited to 'source/blender/blenkernel/intern/nla.c')
| -rw-r--r-- | source/blender/blenkernel/intern/nla.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 6c8eb69703f..423ccb00e8e 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -362,7 +362,7 @@ static float nlastrip_get_frame_actionclip (NlaStrip *strip, float cframe, short return strip->end - scale*(cframe - strip->actstart); } else if (mode == NLATIME_CONVERT_UNMAP) { - return strip->actend - (strip->end - cframe) / scale; + return (strip->end + (strip->actstart * scale - cframe)) / scale; } else /* if (mode == NLATIME_CONVERT_EVAL) */{ if (IS_EQ(cframe, strip->end) && IS_EQ(strip->repeat, ((int)strip->repeat))) { |