Clifford Wolf:

	Cleanups and improvements: values and expressions
	Avoid unnaccesary nodes in csg tree



git-svn-id: http://svn.clifford.at/openscad/trunk@11 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 10 insertions, 0 deletions

diff --git a/module.cc b/module.cc
index acc37d6..6c443de 100644
--- a/module.cc
+++ b/module.cc
@@ -28,6 +28,9 @@ AbstractModule::~AbstractModule()
 
 AbstractNode *AbstractModule::evaluate(const Context*, const QVector<QString>&, const QVector<Value>&, const QVector<AbstractNode*> child_nodes) const
 {
+	if (child_nodes.size() == 1)
+		return child_nodes[0];
+
 	AbstractNode *node = new AbstractNode();
 	foreach (AbstractNode *v, child_nodes)
 		node->children.append(v);
@@ -120,6 +123,13 @@ AbstractNode *Module::evaluate(const Context *ctx, const QVector<QString> &call_
 	foreach (AbstractNode *v, child_nodes)
 		node->children.append(v);
 
+	if (node->children.size() == 1) {
+		AbstractNode *c = node->children[0];
+		node->children.clear();
+		delete node;
+		return c;
+	}
+
 	return node;
 }