blender
/
blender
136
406
Fork 590
Code Issues 6.3k Pull Requests 762 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Bastien Montagne 2022-05-13 18:07:31 +02:00
parent 870ad7d05d 074c695a0d
commit fa7224d8ed
Notes: blender-bot 2023-05-22 12:40:41 +02:00 
Referenced by issue #98136, Crash undoing "Make Library Override" for linked collection with shapekey
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/blendfile_link_append.c
View File

@ -400,7 +400,9 @@ typedef struct LooseDataInstantiateContext {
static bool object_in_any_scene(Main *bmain, Object *ob)
{
LISTBASE_FOREACH (Scene *, sce, &bmain->scenes) {
if (BKE_scene_object_find(sce, ob)) {
/* #BKE_scene_has_object checks bases cache of the scenes' viewlayer, not actual content of
* their collections. */
if (BKE_collection_has_object_recursive(sce->master_collection, ob)) {
return true;
}
}