archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

LineArt: Correct collection intersection mask logic.

Browse Source 
The logic used to be:

"if collection doesn't have child collection, check if ob is from this one"

The correct logic should be:

"if collection child does not have this ob, then check this collection".
This commit is contained in:
YimingWu
2021-12-31 21:54:07 +08:00
parent 97ae08c9fc
commit e79b4523b4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
View File

@@ -1970,13 +1970,12 @@ static uchar lineart_intersection_mask_check(Collection *c, Object *ob)
}
}
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;
}
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;
}