summaryrefslogtreecommitdiff
path: root/module.cc
diff options
context:
space:
mode:
authorclifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>2009-08-04 18:55:25 (GMT)
committerclifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>2009-08-04 18:55:25 (GMT)
commitcf190ff46ee1ce6ffa68ae932682b27438badc91 (patch)
treefa4ebb74f0f737566755a5da816a30fe388c74d2 /module.cc
parentcc803576dcc4810d1ba415895b83ac9a3079de2f (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 'module.cc')
-rw-r--r--module.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/module.cc b/module.cc
index 98c1eb9..db7592c 100644
--- a/module.cc
+++ b/module.cc
@@ -261,7 +261,7 @@ CSGTerm *AbstractNode::render_csg_term(double m[16], QVector<CSGTerm*> *highligh
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)
contact: Jan Huwald // Impressum