diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
| commit | 694382bba9d1645547afc3ece9920e48f8767295 (patch) | |
| tree | 9fb4c3e7f198a764472b7fa95a2e2600320ff04b /src/mainwin.cc | |
| parent | 197a4e4d364fbdd0aca8fb9027476ee1c48652e3 (diff) | |
| parent | 329295f17fe1b3d2d6b218c762201214f431b70a (diff) | |
Merge branch 'master' into value
Conflicts:
src/parsersettings.cc
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index ecbe271..3fdee6b 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -721,9 +721,9 @@ void MainWindow::compileCSG(bool procevents) if (procevents) QApplication::processEvents(); - CSGTermNormalizer normalizer; size_t normalizelimit = 2 * Preferences::inst()->getValue("advanced/openCSGLimit").toUInt(); - this->root_norm_term = normalizer.normalize(this->root_raw_term, normalizelimit); + CSGTermNormalizer normalizer(normalizelimit); + this->root_norm_term = normalizer.normalize(this->root_raw_term); if (this->root_norm_term) { this->root_chain = new CSGChain(); this->root_chain->import(this->root_norm_term); @@ -743,7 +743,7 @@ void MainWindow::compileCSG(bool procevents) highlights_chain = new CSGChain(); for (unsigned int i = 0; i < highlight_terms.size(); i++) { - highlight_terms[i] = normalizer.normalize(highlight_terms[i], normalizelimit); + highlight_terms[i] = normalizer.normalize(highlight_terms[i]); highlights_chain->import(highlight_terms[i]); } } @@ -756,7 +756,7 @@ void MainWindow::compileCSG(bool procevents) background_chain = new CSGChain(); for (unsigned int i = 0; i < background_terms.size(); i++) { - background_terms[i] = normalizer.normalize(background_terms[i], normalizelimit); + background_terms[i] = normalizer.normalize(background_terms[i]); background_chain->import(background_terms[i]); } } @@ -1359,7 +1359,7 @@ void MainWindow::actionExportSTLorOFF(bool) } if (!this->root_N->p3->is_simple()) { - PRINT("Object isn't a valid 2-manifold! Modify your design.."); + PRINT("Object isn't a valid 2-manifold! Modify your design. See http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/STL_Import_and_Export"); clearCurrentOutput(); return; } |