diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
| commit | a0a49b0bc968179b3a1ff65c12cffceb942f538e (patch) | |
| tree | 67698026477492c47933a51303ab339a2d17158c /src/CSGTermEvaluator.cc | |
| parent | f452c986e1639455c518daaa9213af2bb4b672cb (diff) | |
| parent | a126fa826c29b88a9edb3452e407de7f2e5a6c03 (diff) | |
Merge remote-tracking branch 'origin/issue181' into epec-kernel
Conflicts:
src/MainWindow.h
src/ModuleCache.cc
src/mainwin.cc
src/module.cc
src/module.h
src/parsersettings.cc
testdata/modulecache-tests/cascade.sh
testdata/modulecache-tests/cascade2.sh
Diffstat (limited to 'src/CSGTermEvaluator.cc')
| -rw-r--r-- | src/CSGTermEvaluator.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc index a6b654c..71cf149 100644 --- a/src/CSGTermEvaluator.cc +++ b/src/CSGTermEvaluator.cc @@ -115,6 +115,7 @@ Response CSGTermEvaluator::visit(State &state, const AbstractPolyNode &node) if (ps) { t1 = evaluate_csg_term_from_ps(state, this->highlights, this->background, ps, node.modinst, node); + node.progress_report(); } } this->stored_term[node.index()] = t1; @@ -178,6 +179,7 @@ Response CSGTermEvaluator::visit(State &state, const RenderNode &node) shared_ptr<PolySet> ps; if (this->psevaluator) { ps = this->psevaluator->getPolySet(node, true); + node.progress_report(); } if (ps) { t1 = evaluate_csg_term_from_ps(state, this->highlights, this->background, @@ -201,6 +203,7 @@ Response CSGTermEvaluator::visit(State &state, const CgaladvNode &node) if (ps) { t1 = evaluate_csg_term_from_ps(state, this->highlights, this->background, ps, node.modinst, node); + node.progress_report(); } this->stored_term[node.index()] = t1; addToParent(state, node); |