diff options
author | Marius Kintel <marius@kintel.net> | 2011-08-27 19:11:27 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-08-27 19:11:27 (GMT) |
commit | 94d3424d636c7231ef3fb76dcf7d6eeeb83ffd7f (patch) | |
tree | 238d63250eb133a1d9995bcac9a8971a1f675ed4 /src | |
parent | a32007e66c6004531f812befb20a96040b4dbbdd (diff) |
bugfix: Automatic reload and compile got broken during the rendering refactoring
Diffstat (limited to 'src')
-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 7bbc0e9..44c5cff 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -1094,16 +1094,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 - { - screen->updateGL(); } + clearCurrentOutput(); } |