diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
| commit | 694382bba9d1645547afc3ece9920e48f8767295 (patch) | |
| tree | 9fb4c3e7f198a764472b7fa95a2e2600320ff04b /testdata/scad | |
| parent | 197a4e4d364fbdd0aca8fb9027476ee1c48652e3 (diff) | |
| parent | 329295f17fe1b3d2d6b218c762201214f431b70a (diff) | |
Merge branch 'master' into value
Conflicts:
src/parsersettings.cc
Diffstat (limited to 'testdata/scad')
| -rw-r--r-- | testdata/scad/features/import_dxf-tests.scad | 10 | ||||
| -rw-r--r-- | testdata/scad/features/import_stl-tests.scad | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/testdata/scad/features/import_dxf-tests.scad b/testdata/scad/features/import_dxf-tests.scad deleted file mode 100644 index 50a5416..0000000 --- a/testdata/scad/features/import_dxf-tests.scad +++ /dev/null @@ -1,10 +0,0 @@ -import(); -translate([-210,0,0]) import(file="../../dxf/polygons.dxf"); -translate([-210,0,0]) import(file="../../dxf/polygons.dxf", origin=[0,110]); -translate([-210,0,0]) import(file="../../dxf/polygons.dxf", origin=[110,110], scale=0.5); -import(file="../../dxf/multiple-layers.dxf"); -translate([-200,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="0"); -translate([0,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="0"); -translate([200,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="noname"); -translate([0,200,0]) import(file="../../dxf/multiple-layers.dxf", layer="Layer with a pretty long name including \\ \"special\" /'\\\\ characters"); -translate([200,0,0]) import(file="/Users/kintel/code/OpenSCAD/openscad/tests/../testdata/dxf/polygons.dxf"); diff --git a/testdata/scad/features/import_stl-tests.scad b/testdata/scad/features/import_stl-tests.scad deleted file mode 100644 index af42e8d..0000000 --- a/testdata/scad/features/import_stl-tests.scad +++ /dev/null @@ -1,4 +0,0 @@ -import_stl("import.stl"); -translate([2,0,0]) import("import.stl"); -translate([4,0,0]) import("import_bin.stl"); -translate([0,2,0]) import("/Users/kintel/code/OpenSCAD/openscad/tests/../testdata/scad/features/import.stl"); |