[Bf-blender-cvs] [a7cf6ad5471] master: Fix (unreported) broken logic in `BKE_collection_add_from_collection`.

[Bastien Montagne]

Commit: a7cf6ad5471e4109d60d99c49b58d7257c95e392
Author: Bastien Montagne
Date:   Mon Nov 30 17:16:11 2020 +0100
Branches: master
https://developer.blender.org/rBa7cf6ad5471e4109d60d99c49b58d7257c95e392

Fix (unreported) broken logic in `BKE_collection_add_from_collection`.

That function was adding given new collection to all ancestors of the
reference one, instead of only to its immediate parents.

===================================================================

M	source/blender/blenkernel/intern/collection.c

===================================================================

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index ab92480cce2..5eec788255d 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -452,7 +452,7 @@ void BKE_collection_add_from_collection(Main *bmain,
   bool is_instantiated = false;
 
   FOREACH_SCENE_COLLECTION_BEGIN (scene, collection) {
-    if (!ID_IS_LINKED(collection) && BKE_collection_has_collection(collection, collection_src)) {
+    if (!ID_IS_LINKED(collection) && collection_find_child(collection, collection_src)) {
       collection_child_add(collection, collection_dst, 0, true);
       is_instantiated = true;
     }