tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge remote-tracking branch 'origin/blender-v2.91-release'

This commit is contained in:
Sybren A. Stüvel 2020-11-17 11:11:34 +01:00
parent fb033341f9 709ceddab2
commit a25bc79633
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/nla.c
View File

@ -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;
}

3
source/blender/editors/space_graph/graph_select.c
View File

@ -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 */