diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-23 20:14:12 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-23 20:14:12 (GMT) |
| commit | d6efe5cbcb99f7730b47b5945f305f08b5d21b94 (patch) | |
| tree | eb429be5acf82a5710d9879dd5fd00b62f1788b7 /tests/regression/dumptest/child-tests-expected.txt | |
| parent | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (diff) | |
| parent | 10c96326866c8256e82f0092a18f4f4e3ca06a74 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/dumptest/child-tests-expected.txt')
| -rw-r--r-- | tests/regression/dumptest/child-tests-expected.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/regression/dumptest/child-tests-expected.txt b/tests/regression/dumptest/child-tests-expected.txt index 981a5c1..9a886fe 100644 --- a/tests/regression/dumptest/child-tests-expected.txt +++ b/tests/regression/dumptest/child-tests-expected.txt @@ -1,10 +1,10 @@ group() { group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { - sphere($fn = 16, $fa = 12, $fs = 1, r = 1); + sphere($fn = 16, $fa = 12, $fs = 2, r = 1); } multmatrix([[1, 0, 0, 2.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { - cylinder($fn = 16, $fa = 12, $fs = 1, h = 2, r1 = 1, r2 = 1, center = true); + cylinder($fn = 16, $fa = 12, $fs = 2, h = 2, r1 = 1, r2 = 1, center = true); } multmatrix([[1, 0, 0, 5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { cube(size = [2, 2, 2], center = true); @@ -22,7 +22,7 @@ group() { group() { multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { - sphere($fn = 16, $fa = 12, $fs = 1, r = 1); + sphere($fn = 16, $fa = 12, $fs = 2, r = 1); } multmatrix([[1, 0, 0, 2.5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]); multmatrix([[1, 0, 0, 5], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]); @@ -31,7 +31,7 @@ } multmatrix([[1, 0, 0, 2.5], [0, 1, 0, 3], [0, 0, 1, 0], [0, 0, 0, 1]]) { group() { - cylinder($fn = 16, $fa = 12, $fs = 1, h = 2, r1 = 1, r2 = 1, center = true); + cylinder($fn = 16, $fa = 12, $fs = 2, h = 2, r1 = 1, r2 = 1, center = true); } } multmatrix([[1, 0, 0, 5], [0, 1, 0, 3], [0, 0, 1, 0], [0, 0, 0, 1]]) { |