[Bf-blender-cvs] [44ba7b7e1e2] lanpr-under-gp: LANPR: Collection usage flag now effective.

YimingWu noreply at git.blender.org
Fri Jul 3 08:41:21 CEST 2020


Commit: 44ba7b7e1e25ed0261559e961f5c796985115d8b
Author: YimingWu
Date:   Fri Jul 3 14:41:12 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB44ba7b7e1e25ed0261559e961f5c796985115d8b

LANPR: Collection usage flag now effective.

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

M	source/blender/editors/lineart/lineart_cpu.c

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

diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index b7a0357d787..afbcaeef6fc 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -1708,7 +1708,7 @@ int ED_lineart_object_collection_usage_check(Collection *c, Object *o)
                         o->lineart.usage == OBJECT_FEATURE_LINE_INHERENT);
 
   if (object_is_used && (c->lineart_usage != COLLECTION_LRT_INCLUDE)) {
-    if (BKE_collection_has_object_recursive(c, o)) {
+    if (BKE_collection_has_object_recursive(c, (Object *)(o->id.orig_id))) {
       if (c->lineart_usage == COLLECTION_LRT_EXCLUDE) {
         return OBJECT_FEATURE_LINE_EXCLUDE;
       }



More information about the Bf-blender-cvs mailing list