diff options
author | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:00 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:00 (GMT) |
commit | cbabbaed700536b3a1f513fd5a07d25382cb137f (patch) | |
tree | 17478b52e8e8205709c6862b605caf6762445dfa /tests/regression | |
parent | 312a25f2708fcef22e300f7bd2c1aaed61d3095d (diff) | |
parent | 4ff2d1af446c1f276c644b12e6ec4cc6db0b6d65 (diff) |
Merge branch 'master' into boost_filesystem
Conflicts:
openscad.pro
src/module.h
Diffstat (limited to 'tests/regression')
-rw-r--r-- | tests/regression/cgalpngtest/color-tests-expected.png | bin | 9554 -> 8360 bytes | |||
-rw-r--r-- | tests/regression/cgalstlsanitytest/normal-nan-expected.txt | 0 | ||||
-rw-r--r-- | tests/regression/dumptest/color-tests-expected.txt | 9 |
3 files changed, 9 insertions, 0 deletions
diff --git a/tests/regression/cgalpngtest/color-tests-expected.png b/tests/regression/cgalpngtest/color-tests-expected.png Binary files differindex 207fc5b..c7385d2 100644 --- a/tests/regression/cgalpngtest/color-tests-expected.png +++ b/tests/regression/cgalpngtest/color-tests-expected.png diff --git a/tests/regression/cgalstlsanitytest/normal-nan-expected.txt b/tests/regression/cgalstlsanitytest/normal-nan-expected.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/regression/cgalstlsanitytest/normal-nan-expected.txt diff --git a/tests/regression/dumptest/color-tests-expected.txt b/tests/regression/dumptest/color-tests-expected.txt index 1224e2d..95fe012 100644 --- a/tests/regression/dumptest/color-tests-expected.txt +++ b/tests/regression/dumptest/color-tests-expected.txt @@ -52,4 +52,13 @@ } } } + multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) { + color([1, 0, 0, 1]) { + color([0, 0, 1, 1]) { + group() { + cube(size = [10, 10, 10], center = false); + } + } + } + } |