diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-28 02:43:44 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-28 02:43:44 (GMT) |
| commit | f3775d4bdcd474eb9e12614b022270914dfbec17 (patch) | |
| tree | 3ab2ef1ad6864a81708c06b34fb55f9fae5419f4 /src/CSGTermEvaluator.h | |
| parent | c86630c297da202188cbcc0d35566339e0607d60 (diff) | |
| parent | b68537b6ac032cb138e4c6225c6be8680f9664f7 (diff) | |
Merge branch 'visitor' of github.com:openscad/openscad into visitor
Diffstat (limited to 'src/CSGTermEvaluator.h')
| -rw-r--r-- | src/CSGTermEvaluator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h index beb1201..ff62cc1 100644 --- a/src/CSGTermEvaluator.h +++ b/src/CSGTermEvaluator.h @@ -34,7 +34,7 @@ public: vector<CSGTerm*> &background); private: - enum CsgOp {UNION, INTERSECTION, DIFFERENCE, MINKOWSKI}; + enum CsgOp {CSGT_UNION, CSGT_INTERSECTION, CSGT_DIFFERENCE, CSGT_MINKOWSKI}; void addToParent(const State &state, const AbstractNode &node); void applyToChildren(const AbstractNode &node, CSGTermEvaluator::CsgOp op); |