[Bf-blender-cvs] [d0f05bfbcd7] master: LineArt: Fixed source selection for nested-instanced collection.

YimingWu noreply at git.blender.org
Sat Mar 20 12:39:23 CET 2021


Commit: d0f05bfbcd7843b9228ef0d0728799507532a5bd
Author: YimingWu
Date:   Sat Mar 20 18:42:27 2021 +0800
Branches: master
https://developer.blender.org/rBd0f05bfbcd7843b9228ef0d0728799507532a5bd

LineArt: Fixed source selection for nested-instanced collection.

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

M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c

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

diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 2587b3cd8ea..e295a14557d 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -1723,7 +1723,7 @@ static bool _lineart_object_not_in_source_collection(Collection *source, Object
 {
   CollectionChild *cc;
   Collection *c = source->id.orig_id ? (Collection *)source->id.orig_id : source;
-  if (BKE_collection_has_object(c, (Object *)(ob->id.orig_id))) {
+  if (BKE_collection_has_object_recursive_instanced(c, (Object *)(ob->id.orig_id))) {
     return false;
   }
   for (cc = source->children.first; cc; cc = cc->next) {



More information about the Bf-blender-cvs mailing list