diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
| commit | 9740232b080ac3d2fe87309fb51a892faf6ea913 (patch) | |
| tree | 974ac256413de1111a085d12cad7bc3f755792dd /src/mainwin.cc | |
| parent | fef8dba56bae76f6e876656cee603fc895fa0955 (diff) | |
| parent | e60744776193d5dc3f22e7a4a9f3afa8b8664e30 (diff) | |
Merge branch 'master' into issue364
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index b229435..a7b7a30 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -773,14 +773,14 @@ void MainWindow::compileCSG(bool procevents) } if (this->root_chain && - (this->root_chain->polysets.size() > + (this->root_chain->objects.size() > Preferences::inst()->getValue("advanced/openCSGLimit").toUInt())) { - PRINTB("WARNING: Normalized tree has %d elements!", this->root_chain->polysets.size()); + PRINTB("WARNING: Normalized tree has %d elements!", this->root_chain->objects.size()); PRINT("WARNING: OpenCSG rendering has been disabled."); } else { PRINTB("Normalized CSG tree has %d elements", - (this->root_chain ? this->root_chain->polysets.size() : 0)); + (this->root_chain ? this->root_chain->objects.size() : 0)); this->opencsgRenderer = new OpenCSGRenderer(this->root_chain, this->highlights_chain, this->background_chain, @@ -1765,6 +1765,12 @@ void MainWindow::helpLibrary() OPENCSG_VERSION_STRING, qVersion()); +#if defined( __MINGW64__ ) + libinfo += QString("Compiled for MingW64\n\n"); +#elif defined( __MINGW32__ ) + libinfo += QString("Compiled for MingW32\n\n"); +#endif + if (!this->openglbox) { this->openglbox = new QMessageBox(QMessageBox::Information, "OpenGL Info", "OpenSCAD Detailed Library Info ", |