summaryrefslogtreecommitdiff
path: root/src/mainwin.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-01-18 22:49:27 (GMT)
committerMarius Kintel <marius@kintel.net>2012-01-18 22:49:27 (GMT)
commite93a23fdb8f478c2ebbda68df3d5c6d1441fc5bd (patch)
treef3ded751b285adc60eb0bb13b2f4df142c47f197 /src/mainwin.cc
parent1cfc8c68a2681211f2d5b29e580f36854769d7f9 (diff)
Make CSG normalization limit follow the configured CSG limit
Diffstat (limited to 'src/mainwin.cc')
-rw-r--r--src/mainwin.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc
index cbfa46a..4979970 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -779,7 +779,8 @@ void MainWindow::compileCSG(bool procevents)
QApplication::processEvents();
CSGTermNormalizer normalizer;
- this->root_norm_term = normalizer.normalize(this->root_raw_term);
+ size_t normalizelimit = 2 * Preferences::inst()->getValue("advanced/openCSGLimit").toUInt();
+ this->root_norm_term = normalizer.normalize(this->root_raw_term, normalizelimit);
assert(this->root_norm_term);
root_chain = new CSGChain();
@@ -793,7 +794,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]);
+ highlight_terms[i] = normalizer.normalize(highlight_terms[i], normalizelimit);
highlights_chain->import(highlight_terms[i]);
}
}
@@ -806,7 +807,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]);
+ background_terms[i] = normalizer.normalize(background_terms[i], normalizelimit);
background_chain->import(background_terms[i]);
}
}
contact: Jan Huwald // Impressum