[Bf-blender-cvs] [12e67e0054a] temp-lineart-contained: LineArt: Remove merge duplicated code.

YimingWu noreply at git.blender.org
Wed Jun 30 05:12:13 CEST 2021


Commit: 12e67e0054a76c78397d68972487230425a00fca
Author: YimingWu
Date:   Wed Jun 30 11:11:43 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB12e67e0054a76c78397d68972487230425a00fca

LineArt: Remove merge duplicated code.

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

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 7771c1c66b0..1759f309759 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -2028,25 +2028,6 @@ static uchar lineart_intersection_mask_check(Collection *c, Object *ob)
   return 0;
 }
 
-static uchar lineart_intersection_mask_check(Collection *c, Object *ob)
-{
-  LISTBASE_FOREACH (CollectionChild *, cc, &c->children) {
-    uchar result = lineart_intersection_mask_check(cc->collection, ob);
-    if (result) {
-      return result;
-    }
-  }
-
-  if (c->children.first == NULL) {
-    if (BKE_collection_has_object(c, (Object *)(ob->id.orig_id))) {
-      if (c->lineart_flags & COLLECTION_LRT_USE_INTERSECTION_MASK) {
-        return c->lineart_intersection_mask;
-      }
-    }
-  }
-  return 0;
-}
-
 /**
  * See if this object in such collection is used for generating line art,
  * Disabling a collection for line art will doable all objects inside.



More information about the Bf-blender-cvs mailing list