diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-11-17 13:11:34 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-11-17 13:11:34 +0300 |
| commit | a25bc7963353c09308bb93a3fc6f0bc756fd71ef (patch) | |
| tree | 9790813787468817300e84e648afe9208fb9e070 | |
| parent | fb033341f9781a2c050990d020120f0fe2fb2802 (diff) | |
| parent | 709ceddab228da3184d76187010887886cbc87ec (diff) | |
Merge remote-tracking branch 'origin/blender-v2.91-release'
| -rw-r--r-- | source/blender/blenkernel/intern/nla.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_select.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 94bd285e238..56bd83140bf 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1340,7 +1340,7 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip) offset = ceilf(nls->end - strip->start); /* apply necessary offset to ensure that the strip has enough space */ - for (; nls; nls = nls->next) { + for (; nls; nls = nls->prev) { nls->start -= offset; nls->end -= offset; } diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 57aaa1fefce..ba684972dd7 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -529,6 +529,9 @@ static void box_select_graphkeys(bAnimContext *ac, /* filter data */ filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_NODUPLIS); + if (sipo->flag & SIPO_SELCUVERTSONLY) { + filter |= ANIMFILTER_FOREDIT | ANIMFILTER_SELEDIT; + } ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); /* get beztriple editing/validation funcs */ |