blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Fix #111776: Bone Collections with linked file from 3.6 #111793

Closed
Christoph Lendenfeld wants to merge 3 commits from ChrisLend:fix_collections_disappearing into main
pull from: ChrisLend:fix_collections_disappearing
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 3 Files Changed 1 +3 -7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenloader/intern/versioning_400.cc
View File

@ -277,14 +277,10 @@ void do_versions_after_linking_400(FileData *fd, Main *bmain)
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 400, 21)) {
if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "BoneColor", "color")) {
version_bonegroup_migrate_color(bmain);
}
version_bonegroup_migrate_color(bmain);
if (!DNA_struct_elem_find(fd->filesdna, "bArmature", "ListBase", "collections")) {
version_bonelayers_to_bonecollections(bmain);
version_bonegroups_to_bonecollections(bmain);
}
version_bonelayers_to_bonecollections(bmain);
version_bonegroups_to_bonecollections(bmain);
}
/**