diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
| commit | 816377cc02fe5dd4be945c0f3d415861114b4980 (patch) | |
| tree | 306e9d1363aa66bc919e43b80b3380fab9f60ea9 /source/blender/blenkernel/intern/nla.c | |
| parent | c8af263e5d8d9d41a757e8438cdcf3b64d57e0c0 (diff) | |
| parent | ee768ada680ce0a8aa184c882005c0ef1c0140fb (diff) | |
Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas
The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas
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 480c79fbc1a..c41c4ae78e4 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -291,7 +291,7 @@ NlaStrip *add_nlastrip (bAction *act) /* determine initial range * - strip length cannot be 0... ever... */ - calc_action_range(strip->act, &strip->actstart, &strip->actend, 0); + calc_action_range(strip->act, &strip->actstart, &strip->actend, 1); strip->start = strip->actstart; strip->end = (IS_EQ(strip->actstart, strip->actend)) ? (strip->actstart + 1.0f): (strip->actend); |