grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-08 13:19:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #242 from kelvie/diff-tag-fix

Browse source 
Fix diff/intersect when some tags are hidden
This commit is contained in:
Revar Desmera 2020-08-25 22:50:48 -07:00 committed by GitHub
commit 248921df8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
attachments.scad
View file

@ -1235,6 +1235,8 @@ module show(tags="")
// } // }
module diff(neg, pos=undef, keep=undef) module diff(neg, pos=undef, keep=undef)
{ {
// Don't perform the operation if the current tags are hidden
if (attachment_is_shown($tags)) {
difference() { difference() {
if (pos != undef) { if (pos != undef) {
show(pos) children(); show(pos) children();
@ -1247,6 +1249,7 @@ module diff(neg, pos=undef, keep=undef)
} }
show(neg) children(); show(neg) children();
} }
}
if (keep!=undef) { if (keep!=undef) {
show(keep) children(); show(keep) children();
} else if (pos!=undef) { } else if (pos!=undef) {
@ -1280,6 +1283,8 @@ module diff(neg, pos=undef, keep=undef)
// } // }
module intersect(a, b=undef, keep=undef) module intersect(a, b=undef, keep=undef)
{ {
// Don't perform the operation if the current tags are hidden
if (attachment_is_shown($tags)) {
intersection() { intersection() {
if (b != undef) { if (b != undef) {
show(b) children(); show(b) children();
@ -1292,6 +1297,7 @@ module intersect(a, b=undef, keep=undef)
} }
show(a) children(); show(a) children();
} }
}
if (keep!=undef) { if (keep!=undef) {
show(keep) children(); show(keep) children();
} else if (b!=undef) { } else if (b!=undef) {