diff options
| author | Joshua Leung <aligorith@gmail.com> | 2013-01-21 10:31:17 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2013-01-21 10:31:17 +0400 |
| commit | bfa065f10c572cef89c61742071a11a599cec408 (patch) | |
| tree | c6b8c13f109c7e8464f8a9180593def70cf5b853 /source/blender/makesrna/intern/rna_nla.c | |
| parent | 73a68c95a45c03f05ab8634ffcdb3e2fbd508b5c (diff) | |
Bugfix [#33852] Scale of a strip in NLA is changed after moving it long distance
using numeric input
When using numeric input to move strips, the strip extent clamping code could
end up prematurely truncating one endpoint. This was because the clamping code
uses the values of the other end (e.g. end for start, and start for end) as one
of the limits on its allowable range to prevent inverted strips.
Now we just set these values twice - the first time, one of the endpoints may
still get truncated (while the other one will be able to go to its correct
value), then the second time both will get set correctly (and validated too).
Diffstat (limited to 'source/blender/makesrna/intern/rna_nla.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 574f06e9107..2b7f6a182a0 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -115,7 +115,7 @@ static void rna_NlaStrip_start_frame_set(PointerRNA *ptr, float value) if (data->prev->type == NLASTRIP_TYPE_TRANSITION) { CLAMP(value, data->prev->start + NLASTRIP_MIN_LEN_THRESH, data->end - NLASTRIP_MIN_LEN_THRESH); - /* readjust the transition to stick to the endpoints of the action-clips */ + /* re-adjust the transition to stick to the endpoints of the action-clips */ data->prev->end = value; } else { |