diff options
| author | Joshua Leung <aligorith@gmail.com> | 2017-09-12 03:35:04 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2017-09-12 15:53:50 +0300 |
| commit | d2202117fe2cb596e4a6d817300e8f46428ee956 (patch) | |
| tree | af3f47ae3a7e067c71d42fcf898a400c6125752f /source/blender/blenkernel/intern/action.c | |
| parent | a704a66914faa7e82bb5403f898d4a2c11f678a9 (diff) | |
T50354: Action length calculation added unnecessary padding if some F-Curves
only contained a single key (on the last real frame of the action).
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index bb4e09364d4..5bd6085c8f5 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -1129,9 +1129,13 @@ void calc_action_range(const bAction *act, float *start, float *end, short incl_ if (fcu->totvert) { float nmin, nmax; - /* get extents for this curve */ - /* TODO: allow enabling/disabling this? */ - calc_fcurve_range(fcu, &nmin, &nmax, false, true); + /* get extents for this curve + * - no "selected only", since this is often used in the backend + * - no "minimum length" (we will apply this later), otherwise + * single-keyframe curves will increase the overall length by + * a phantom frame (T50354) + */ + calc_fcurve_range(fcu, &nmin, &nmax, false, false); /* compare to the running tally */ min = min_ff(min, nmin); @@ -1184,7 +1188,9 @@ void calc_action_range(const bAction *act, float *start, float *end, short incl_ } if (foundvert || foundmod) { + /* ensure that action is at least 1 frame long (for NLA strips to have a valid length) */ if (min == max) max += 1.0f; + *start = min; *end = max; } |