diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-25 16:44:06 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-25 16:44:06 (GMT) |
| commit | 1679a57240d1fd5c852b095859a37ad5b4bb99a8 (patch) | |
| tree | 5265e55569e007a13631cb09558e695a4470c2bb | |
| parent | c5511b05ecfc821d2c46912a9dd472df4dec956a (diff) | |
| parent | 3e64e63b0113a99666ad68aa3e82bb7b80324d9b (diff) | |
Merge branch 'master' into buildfix
| -rw-r--r-- | src/glview.cc | 2 | ||||
| -rw-r--r-- | testdata/scad/features/color-tests.scad | 1 | ||||
| -rw-r--r-- | tests/regression/cgalpngtest/color-tests-expected.png | bin | 9554 -> 8360 bytes | |||
| -rw-r--r-- | tests/regression/dumptest/color-tests-expected.txt | 9 |
4 files changed, 11 insertions, 1 deletions
diff --git a/src/glview.cc b/src/glview.cc index d9f6bb5..f25cac6 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -105,7 +105,7 @@ void GLView::init() void GLView::setRenderer(Renderer *r) { this->renderer = r; - updateGL(); + if (r) updateGL(); // Let the last image stay, e.g. to avoid animation flickering } void GLView::initializeGL() 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(); 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/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); + } + } + } + } |
