From 02efc0111c1f7c913b750ca7757ba482fe610af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 17 Nov 2020 10:58:40 +0100 Subject: [PATCH 1/2] Fix T82588: Box Select selects keyframes hidden by "Only Show Selected" Select only editable keys on selected curves when "Only Show Selected Curves" is enabled in the Graph Editor's View menu. This prevents selecting invisible keys with box, circle, and lasso select in the Graph Editor. Reviewed By: looch Differential Revision: https://developer.blender.org/D9580 --- source/blender/editors/space_graph/graph_select.c | 3 +++ 1 file changed, 3 insertions(+) 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 */ From 709ceddab228da3184d76187010887886cbc87ec Mon Sep 17 00:00:00 2001 From: Wayde Moss Date: Tue, 17 Nov 2020 11:00:53 +0100 Subject: [PATCH 2/2] Fix T82774: NLA Sync Length Typo Fix When offsetting strips to the left, to make space when syncing strip length, move the preceding NLA strips instead of the succeeding strips. The bug seems to be from a copy/pasting typo. Reviewed By: sybren Differential Revision: https://developer.blender.org/D9583 --- source/blender/blenkernel/intern/nla.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }