forked from bartvdbraak/blender
Merge remote-tracking branch 'origin/blender-v2.91-release'
This commit is contained in:
commit
a25bc79633
@ -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;
|
||||
}
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user