diff options
author | Bastien Montagne <bastien@blender.org> | 2022-03-25 13:38:38 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-03-25 13:39:06 +0300 |
commit | 75b8c4fc18997851620f4abd491f7c418f6666ee (patch) | |
tree | 193040a52208754c0ff115d58e8585baa2d8b6d0 /source/blender | |
parent | 484af996aa75750c8b419a25b68c9eb8d7efcf19 (diff) |
LibOverride: Prevent some more potential modification of overridden collections.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 891145b47c9..bdaea487cfb 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -432,7 +432,8 @@ void BKE_collection_add_from_object(Main *bmain, bool is_instantiated = false; FOREACH_SCENE_COLLECTION_BEGIN (scene, collection) { - if (!ID_IS_LINKED(collection) && BKE_collection_has_object(collection, ob_src)) { + if (!ID_IS_LINKED(collection) && !ID_IS_OVERRIDABLE_LIBRARY(collection) && + BKE_collection_has_object(collection, ob_src)) { collection_child_add(collection, collection_dst, 0, true); is_instantiated = true; } @@ -454,7 +455,8 @@ void BKE_collection_add_from_collection(Main *bmain, bool is_instantiated = false; FOREACH_SCENE_COLLECTION_BEGIN (scene, collection) { - if (!ID_IS_LINKED(collection) && collection_find_child(collection, collection_src)) { + if (!ID_IS_LINKED(collection) && !ID_IS_OVERRIDABLE_LIBRARY(collection) && + collection_find_child(collection, collection_src)) { collection_child_add(collection, collection_dst, 0, true); is_instantiated = true; } |