diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-27 19:42:50 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-27 19:42:50 (GMT) |
| commit | b3dd77d2521fae2305251a57217b1b22fe7180e0 (patch) | |
| tree | a8e1a733736e13f68b594ae20130b5c72e78e869 /src/mainwin.cc | |
| parent | 065e1de739b5e70d04b13032aa2c99d820d0ca52 (diff) | |
| parent | 76a781d2fbb5610ea0483c6c08bb12b311f09494 (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/mainwin.cc
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index fab0c74..89d17c5 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -1114,16 +1114,18 @@ void MainWindow::actionReloadCompile() compile(true); if (this->root_node) compileCSG(true); + // Go to non-CGAL view mode + if (viewActionThrownTogether->isChecked()) { + viewModeThrownTogether(); + } + else { #ifdef ENABLE_OPENCSG - if (!(viewActionOpenCSG->isVisible() && viewActionOpenCSG->isChecked()) && - !viewActionThrownTogether->isChecked()) { viewModeOpenCSG(); - } - else +#else + viewModeThrownTogether(); #endif - { - this->glview->updateGL(); } + clearCurrentOutput(); } |