diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-04-10 14:31:11 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-04-10 14:31:11 +0400 |
| commit | 2c42d342d9700553476ed59f4890e819ade5427e (patch) | |
| tree | 5a7bdea78dfc248bd544cbf8c28fb07ac3fd8862 | |
| parent | 3be0c804aed1af822f54ca7a119e95e2aa4ef187 (diff) | |
Bugfix #3720
Using stride-bone in an NLA, on a path without speed Ipo, didn't correct
the case when an action starts on a non-zero value.
Patch provided by Roland Hess. Thanks!
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 642ce855383..c528fe783bd 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -942,7 +942,8 @@ static void do_nla(Object *ob, int blocktype) ctime= bsystem_time(ob, parent, scene_cfra, 0.0); if(calc_ipo_spec(cu->ipo, CU_SPEED, &ctime)==0) { - ctime /= cu->pathlen; + /* correct for actions not starting on zero */ + ctime= (ctime - strip->actstart)/cu->pathlen; CLAMP(ctime, 0.0, 1.0); } pdist = ctime*cu->path->totdist; |