diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-13 17:19:34 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-13 17:19:34 (GMT) |
| commit | e77615be3027cfe365e3e52f3ed609dae9711028 (patch) | |
| tree | 21babea118b3bc59037e4e487a4c6bd6811b5412 /src/expr.cc | |
| parent | 0f22d6e9ad562e87ae484a82df56ddee30e87343 (diff) | |
| parent | 4401a136b9cbf01aa99cfdf5d9d67d62579dd853 (diff) | |
Merge branch 'children' of git://github.com/vicnet/openscad into vicnet-children
Conflicts:
tests/CMakeLists.txt
Diffstat (limited to 'src/expr.cc')
| -rw-r--r-- | src/expr.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr.cc b/src/expr.cc index 8500d13..594fccf 100644 --- a/src/expr.cc +++ b/src/expr.cc @@ -119,7 +119,8 @@ Value Expression::evaluate(const Context *context) const Value v2 = this->children[1]->evaluate(context); Value v3 = this->children[2]->evaluate(context); if (v1.type() == Value::NUMBER && v2.type() == Value::NUMBER && v3.type() == Value::NUMBER) { - return Value(v1.toDouble(), v2.toDouble(), v3.toDouble()); + Value::RangeType range(v1.toDouble(), v2.toDouble(), v3.toDouble()); + return Value(range); } return Value(); } |