diff options
| author | Marius Kintel <marius@kintel.net> | 2012-04-24 02:18:29 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-04-24 02:18:29 (GMT) |
| commit | 04947a8905f8c6a722669c9cdfd465b54a44b0f6 (patch) | |
| tree | 81ad1de59457db2586e4dfc788f8a443264552d7 /src/csgtermnormalizer.cc | |
| parent | cab12ccb86e03535cdafc7357dbbc0b5d2ba1fa2 (diff) | |
| parent | f5a7e92367adb7bbadaff8d27ff1610d91034b6a (diff) | |
Merge branch 'master' into value
Diffstat (limited to 'src/csgtermnormalizer.cc')
| -rw-r--r-- | src/csgtermnormalizer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/csgtermnormalizer.cc b/src/csgtermnormalizer.cc index b4bfa4c..6600758 100644 --- a/src/csgtermnormalizer.cc +++ b/src/csgtermnormalizer.cc @@ -46,8 +46,8 @@ shared_ptr<CSGTerm> CSGTermNormalizer::normalizePass(shared_ptr<CSGTerm> term) if (!term || term->type == CSGTerm::TYPE_PRIMITIVE) return term; if (term->left) term->left = normalizePass(term->left); } while (term->type != CSGTerm::TYPE_UNION && - (term->right && term->right->type != CSGTerm::TYPE_PRIMITIVE || - term->left && term->left->type == CSGTerm::TYPE_UNION)); + ((term->right && term->right->type != CSGTerm::TYPE_PRIMITIVE) || + (term->left && term->left->type == CSGTerm::TYPE_UNION))); term->right = normalizePass(term->right); // FIXME: Do we need to take into account any transformation of item here? |