[Bf-blender-cvs] [7339663bbc3] blender-v3.0-release: LineArt: Correct collection intersection mask logic.
YimingWu
noreply at git.blender.org
Tue Jan 11 10:38:38 CET 2022
Commit: 7339663bbc3c5089d74fb870631ab6941977e9f3
Author: YimingWu
Date: Fri Dec 31 21:54:07 2021 +0800
Branches: blender-v3.0-release
https://developer.blender.org/rB7339663bbc3c5089d74fb870631ab6941977e9f3
LineArt: Correct collection intersection mask logic.
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".
===================================================================
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 9a2304755bd..08a0deda5dc 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -1963,13 +1963,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;
}
More information about the Bf-blender-cvs
mailing list