[Bf-blender-cvs] [edeb9e5b016] blender2.8: Fix T55868: duplicating collection instances fails sometimes.

Brecht Van Lommel noreply at git.blender.org
Mon Jul 9 15:39:05 CEST 2018


Commit: edeb9e5b01626f0dcdf6c0f1c9b8c891bc681e5f
Author: Brecht Van Lommel
Date:   Mon Jul 9 15:36:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBedeb9e5b01626f0dcdf6c0f1c9b8c891bc681e5f

Fix T55868: duplicating collection instances fails sometimes.

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

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

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

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 1d9cc9bb8d0..0c93f304218 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -473,7 +473,7 @@ static bool collection_object_add(Main *bmain, Collection *collection, Object *o
 {
 	if (ob->dup_group) {
 		/* Cyclic dependency check. */
-		if (collection_find_child_recursive(collection, ob->dup_group)) {
+		if (collection_find_child_recursive(ob->dup_group, collection)) {
 			return false;
 		}
 	}



More information about the Bf-blender-cvs mailing list