diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2022-09-12 18:13:25 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2022-09-12 18:13:25 +0300 |
| commit | ce07bc36281525484a9469499a1442572211b26a (patch) | |
| tree | ad43dee5256aa48acba484064dfb460c68be00c2 | |
| parent | 038a19ce6c357fb4541cda6169339c57d6fe473e (diff) | |
| parent | 7c33d7b4b5b334ed6d9c9585367982dc02671b52 (diff) | |
Merge remote-tracking branch 'origin/blender-v3.3-release'
| -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 9457c20eb7d..da508ff865c 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1241,7 +1241,7 @@ static NlaStrip *nlastrip_find_active(ListBase /* NlaStrip */ *strips) float BKE_nlastrip_compute_frame_from_previous_strip(NlaStrip *strip) { - float limit_prev = MINFRAMEF; + float limit_prev = MINAFRAMEF; /* Find the previous end frame, with a special case if the previous strip was a transition : */ if (strip->prev) { |