diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-29 14:52:05 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-29 14:52:05 +0300 |
| commit | 67115dbcc184858cde0c29c6337e6b18f7369d16 (patch) | |
| tree | b969d9bedd171110ea7ad20271f41630d290126c /source/blender/blenkernel/intern/anim.c | |
| parent | b230ca2a90df8b40f32b11082971fbc3cba9b13b (diff) | |
| parent | 6a4a911fc39ffc5f5a43cf6da46bd6af34167992 (diff) | |
Merge branch 'master' into libmv_prediction
Diffstat (limited to 'source/blender/blenkernel/intern/anim.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index aff99d3e1bf..b878dbe1f39 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -627,6 +627,9 @@ int where_on_path(Object *ob, float ctime, float vec[4], float dir[3], float qua if (!bl->nr) return 0; if (bl->poly > -1) cycl = 1; + /* values below zero for non-cyclic curves give strange results */ + BLI_assert(cycl || ctime >= 0.0f); + ctime *= (path->len - 1); s1 = (int)floor(ctime); |