Merge branch 'master' into value

Conflicts:
	src/linearextrude.cc

1 files changed, 9 insertions, 0 deletions

diff --git a/src/linearextrude.cc b/src/linearextrude.cc
index b193181..7a006f7 100644
--- a/src/linearextrude.cc
+++ b/src/linearextrude.cc
@@ -75,6 +75,15 @@ AbstractNode *LinearExtrudeModule::evaluate(const Context *ctx, const ModuleInst
 		node->filename = c.getAbsolutePath(file.toString());
 	}
 
+	// if height not given, and first argument is a number,
+	// then assume it should be the height.
+	if (c.lookup_variable("height").type == Value::UNDEFINED &&
+			inst->argnames.size() > 0 && 
+			inst->argnames[0] == "" &&
+			inst->argvalues[0].type == Value::NUMBER) {
+		height = Value(inst->argvalues[0]);
+	}
+
 	node->layername = layer.isUndefined() ? "" : layer.toString();
 	node->height = height.toDouble();
 	node->convexity = (int)convexity.toDouble();