diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
| commit | 997a0afac3f9b3a7aa2c4a8d351c3697bc91f7aa (patch) | |
| tree | 3b3816d1557746f5f2e3e86a9239821472012024 /testdata | |
| parent | d0de384a7e1642d09726579fdd75f1588cfaada7 (diff) | |
| parent | af0658a8fe441ebb0eb3d238e7055fd592343605 (diff) | |
Merge branch 'master' and fix bugs
Conflicts:
src/openscad.cc
tests/CMakeLists.txt
Diffstat (limited to 'testdata')
| -rw-r--r-- | testdata/scad/features/import_bin_solid.stl | bin | 0 -> 2384 bytes | |||
| -rw-r--r-- | testdata/scad/templates/import_stl-tests-template.scad | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/testdata/scad/features/import_bin_solid.stl b/testdata/scad/features/import_bin_solid.stl Binary files differnew file mode 100644 index 0000000..c1886db --- /dev/null +++ b/testdata/scad/features/import_bin_solid.stl diff --git a/testdata/scad/templates/import_stl-tests-template.scad b/testdata/scad/templates/import_stl-tests-template.scad index 685b868..2cc886d 100644 --- a/testdata/scad/templates/import_stl-tests-template.scad +++ b/testdata/scad/templates/import_stl-tests-template.scad @@ -1,4 +1,6 @@ import_stl("import.stl"); translate([2,0,0]) import("import.stl"); translate([4,0,0]) import("import_bin.stl"); +// Test binary STLs which happen to start with the string "solid" +translate([0,4,0]) import("import_bin_solid.stl"); translate([0,2,0]) import("@CMAKE_SOURCE_DIR@/../testdata/scad/features/import.stl"); |