diff options
| author | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-08-04 18:55:25 (GMT) |
|---|---|---|
| committer | clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c> | 2009-08-04 18:55:25 (GMT) |
| commit | cf190ff46ee1ce6ffa68ae932682b27438badc91 (patch) | |
| tree | fa4ebb74f0f737566755a5da816a30fe388c74d2 /transform.cc | |
| parent | cc803576dcc4810d1ba415895b83ac9a3079de2f (diff) | |
Stefan Farthofer (aka meta/metaz):
Renamed some enums to avoid collitions with windows.h defines
git-svn-id: http://svn.clifford.at/openscad/trunk@86 b57f626f-c46c-0410-a088-ec61d464b74c
Diffstat (limited to 'transform.cc')
| -rw-r--r-- | transform.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transform.cc b/transform.cc index 6e65c3a..879a026 100644 --- a/transform.cc +++ b/transform.cc @@ -192,7 +192,7 @@ CSGTerm *TransformNode::render_csg_term(double c[16], QVector<CSGTerm*> *highlig if (t2 && !t1) { t1 = t2; } else if (t2 && t1) { - t1 = new CSGTerm(CSGTerm::UNION, t1, t2); + t1 = new CSGTerm(CSGTerm::TYPE_UNION, t1, t2); } } if (t1 && modinst->tag_highlight && highlights) |