vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

In some rare cases, subtrees got invalidated and caused an assert failure

export-menu
Marius Kintel 2014-01-06 01:27:01 -05:00
parent 28fb4dc4cb
commit 5fc6af7782
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/csgtermnormalizer.cc
View File

@ -32,6 +32,22 @@ shared_ptr<CSGTerm> CSGTermNormalizer::normalize(const shared_ptr<CSGTerm> &root
return temp;
}
/*!
After aborting, a subtree might have become invalidated (NULL child term)
since terms can be instantiated multiple times.
This will search for NULL children an recursively repair the corresponding
subtree.
*/
shared_ptr<CSGTerm> CSGTermNormalizer::cleanup_term(shared_ptr<CSGTerm> &t)
{
if (t->type != CSGTerm::TYPE_PRIMITIVE) {
if (t->left) t->left = cleanup_term(t->left);
if (t->right) t->right = cleanup_term(t->right);
return collapse_null_terms(t);
}
else return t;
}
shared_ptr<CSGTerm> CSGTermNormalizer::normalizePass(shared_ptr<CSGTerm> term)
{
// This function implements the CSG normalization
@ -62,7 +78,13 @@ shared_ptr<CSGTerm> CSGTermNormalizer::normalizePass(shared_ptr<CSGTerm> term)
if (!this->aborted) term->right = normalizePass(term->right);
// FIXME: Do we need to take into account any transformation of item here?
return collapse_null_terms(term);
shared_ptr<CSGTerm> t = collapse_null_terms(term);
if (this->aborted) {
if (t) t = cleanup_term(t);
}
return t;
}
shared_ptr<CSGTerm> CSGTermNormalizer::collapse_null_terms(const shared_ptr<CSGTerm> &term)

1
src/csgtermnormalizer.h
View File

@ -15,6 +15,7 @@ private:
shared_ptr<CSGTerm> normalizePass(shared_ptr<CSGTerm> term) ;
bool match_and_replace(shared_ptr<CSGTerm> &term);
shared_ptr<CSGTerm> collapse_null_terms(const shared_ptr<CSGTerm> &term);
shared_ptr<CSGTerm> cleanup_term(shared_ptr<CSGTerm> &t);
unsigned int count(const shared_ptr<CSGTerm> &term) const;
bool aborted;