diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-02 19:43:59 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-02 19:43:59 (GMT) |
| commit | 18e3a7d9ad8e052d626ac250a9c9d5f36f29a54d (patch) | |
| tree | 565c87e051833daa1c0eed7ffe45533fcf05c2fb /src/csgtermnormalizer.cc | |
| parent | 61fffc0e5b92c9bda7e376983fdc90b498eed745 (diff) | |
| parent | eb30d42b5dd3ed5bb37336ed46a59eabaca81e06 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into misc_updates
Conflicts:
scripts/uni-build-dependencies.sh
Diffstat (limited to 'src/csgtermnormalizer.cc')
| -rw-r--r-- | src/csgtermnormalizer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csgtermnormalizer.cc b/src/csgtermnormalizer.cc index e2474e9..81fab80 100644 --- a/src/csgtermnormalizer.cc +++ b/src/csgtermnormalizer.cc @@ -20,7 +20,7 @@ shared_ptr<CSGTerm> CSGTermNormalizer::normalize(const shared_ptr<CSGTerm> &root PRINTB("WARNING: Normalized tree is growing past %d elements. Aborting normalization.\n", this->limit); // Clean up any partially evaluated terms shared_ptr<CSGTerm> newroot = root, tmproot; - while (newroot != tmproot) { + while (newroot && newroot != tmproot) { tmproot = newroot; newroot = collapse_null_terms(tmproot); } |