diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-05-13 19:07:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-05-13 19:07:31 +0300 |
| commit | fa7224d8ed88fbfbf55e5d1a83cef49c309785cb (patch) | |
| tree | f2a8260a74117d4a6bc2c3059b7f3a2e520367ca /source/blender/blenkernel/intern/blendfile_link_append.c | |
| parent | 870ad7d05db2e14164d818cd5320345fd8110a69 (diff) | |
| parent | 074c695a0d4de88550be71181690639ab6b16dcf (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile_link_append.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile_link_append.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c index e2f22ef00d3..e99f71c1a60 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.c +++ b/source/blender/blenkernel/intern/blendfile_link_append.c @@ -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; } } |