summaryrefslogtreecommitdiff
path: root/testdata/scad/features
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-12-26 15:37:00 (GMT)
committerMarius Kintel <marius@kintel.net>2011-12-26 15:37:00 (GMT)
commitcbabbaed700536b3a1f513fd5a07d25382cb137f (patch)
tree17478b52e8e8205709c6862b605caf6762445dfa /testdata/scad/features
parent312a25f2708fcef22e300f7bd2c1aaed61d3095d (diff)
parent4ff2d1af446c1f276c644b12e6ec4cc6db0b6d65 (diff)
Merge branch 'master' into boost_filesystem
Conflicts: openscad.pro src/module.h
Diffstat (limited to 'testdata/scad/features')
-rw-r--r--testdata/scad/features/color-tests.scad1
1 files changed, 1 insertions, 0 deletions
diff --git a/testdata/scad/features/color-tests.scad b/testdata/scad/features/color-tests.scad
index 3ef2540..3fc98c8 100644
--- a/testdata/scad/features/color-tests.scad
+++ b/testdata/scad/features/color-tests.scad
@@ -13,3 +13,4 @@ translate([12,0,0]) color([0,0,1],0.5) object();
translate([24,0,0]) color(c="Green",alpha=0.2) object();
translate([-12,12,0]) color() object();
translate([-12,0,0]) color(alpha=0.5) object();
+translate([24,-12,0]) color([1,0,0]) color([0,0,1]) object();
contact: Jan Huwald // Impressum