blender
/
blender
135
420
Fork 601
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

WIP: Fix #105260: Skip nla tracks with library linked strips #107758

Draft
Denys Hsu wants to merge 2 commits from cgtinker/blender:nla_linked_lib into main
pull from: cgtinker/blender:nla_linked_lib
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 2 Files Changed 1 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4eb65435d5 - Show all commits

3
source/blender/editors/animation/anim_filter.c
View File

@ -1572,11 +1572,12 @@ static size_t animfilter_nla(bAnimContext *UNUSED(ac),
if (filter_mode & ANIMFILTER_FOREDIT) {
NlaStrip *strip;
for (strip = nlt->strips.first; strip; strip = strip->next) {
/* Don't have to check all, if any is linked the nla track should not be edited.*/
if (strip->act) {
if (ID_IS_LINKED(strip->act)) {
is_lib_linked = true;
break;
}
break;
}
}
}