diff options
| -rw-r--r-- | RELEASE_NOTES | 1 | ||||
| -rw-r--r-- | doc/TODO.txt | 1 | ||||
| -rw-r--r-- | src/mainwin.cc | 14 |
3 files changed, 10 insertions, 6 deletions
diff --git a/RELEASE_NOTES b/RELEASE_NOTES index d3d6d92..a95d588 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -2,6 +2,7 @@ OpenSCAD 20xx.yy ================ Bugfixes: +o square() crashed if any of the dimensions were zero o Flush Caches didn't flush cached USE'd modules OpenSCAD 2011.06 diff --git a/doc/TODO.txt b/doc/TODO.txt index be7d332..751b544 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -171,6 +171,7 @@ o Misc empty AbstractNode instead of being ignored? - Bug: Using the background operator (%) on the only object in a scene triggers a CSG error: No top level object found + - Dependency tracking of libraries (USE'd modules) isn't implemented. See Mail from nophead 20110823. o Grammar - dim->name -> dim->label - A random(seed) function 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(); } |