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/CGALEvaluator.h | |
| parent | c86630c297da202188cbcc0d35566339e0607d60 (diff) | |
| parent | b68537b6ac032cb138e4c6225c6be8680f9664f7 (diff) | |
Merge branch 'visitor' of github.com:openscad/openscad into visitor
Diffstat (limited to 'src/CGALEvaluator.h')
| -rw-r--r-- | src/CGALEvaluator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CGALEvaluator.h b/src/CGALEvaluator.h index 282d6ab..9a1c88c 100644 --- a/src/CGALEvaluator.h +++ b/src/CGALEvaluator.h @@ -22,7 +22,7 @@ using std::pair; class CGALEvaluator : public Visitor { public: - enum CsgOp {UNION, INTERSECTION, DIFFERENCE, MINKOWSKI, HULL}; + enum CsgOp {CGE_UNION, CGE_INTERSECTION, CGE_DIFFERENCE, CGE_MINKOWSKI, CGE_HULL}; // FIXME: If a cache is not given, we need to fix this ourselves CGALEvaluator(QHash<string, CGAL_Nef_polyhedron> &cache, const Tree &tree) : cache(cache), tree(tree), psevaluator(*this) {} virtual ~CGALEvaluator() {} |