diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:31:02 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:31:02 (GMT) |
| commit | 133a705feef86f11d5afc7fb69ed30585db9e533 (patch) | |
| tree | f886e81c8853cdc1b26f557ad435e78c3c347a6b /tests/opencsgtest.cc | |
| parent | eb79c56ece95f5508e9ee12326995a84a1f9a5f2 (diff) | |
| parent | b927e9e1511ca655b4c15b003343ddffc08b0938 (diff) | |
merging
Merge remote branch 'upstream/master' into visitortests
Conflicts:
src/cgaladv.cc
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
Diffstat (limited to 'tests/opencsgtest.cc')
| -rw-r--r-- | tests/opencsgtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/opencsgtest.cc b/tests/opencsgtest.cc index 026978d..6d92312 100644 --- a/tests/opencsgtest.cc +++ b/tests/opencsgtest.cc @@ -241,8 +241,8 @@ int main(int argc, char *argv[]) OpenCSGRenderer opencsgRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain, csgInfo.glview->shaderinfo); ThrownTogetherRenderer thrownTogetherRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain); -// csgInfo.glview->setRenderer(&thrownTogetherRenderer); - csgInfo.glview->setRenderer(&opencsgRenderer); + csgInfo.glview->setRenderer(&thrownTogetherRenderer); +// csgInfo.glview->setRenderer(&opencsgRenderer); csgInfo.glview->paintGL(); |