mirror of
https://github.com/revarbat/BOSL2.git
synced 2025-01-16 13:50:23 +01:00
fix merge issues
This commit is contained in:
parent
e68ff5ff4c
commit
01b33416a8
@ -129,16 +129,8 @@ module sparse_wall2d(size=[50,100], maxang=30, strut=5, max_bridge=20, anchor=CE
|
|||||||
|
|
||||||
ang = atan(ystep/zstep);
|
ang = atan(ystep/zstep);
|
||||||
len = zstep / cos(ang);
|
len = zstep / cos(ang);
|
||||||
<<<<<<< master
|
|
||||||
size = [thick, l, h];
|
|
||||||
attachable(anchor,spin,orient, size=size) {
|
|
||||||
yrot(90)
|
|
||||||
linear_extrude(height=thick, convexity=4*yreps, center=true) {
|
|
||||||
=======
|
|
||||||
|
|
||||||
attachable(anchor,spin, two_d=true, size=size) {
|
attachable(anchor,spin, two_d=true, size=size) {
|
||||||
union() {
|
union() {
|
||||||
>>>>>>> master
|
|
||||||
difference() {
|
difference() {
|
||||||
square([h, l], center=true);
|
square([h, l], center=true);
|
||||||
square([h-2*strut, l-2*strut], center=true);
|
square([h-2*strut, l-2*strut], center=true);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user