diff options
| author | Marius Kintel <marius@kintel.net> | 2012-08-28 03:29:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-08-28 03:29:15 (GMT) |
| commit | 0e9d66f5326860122c997ca084a1f3df7c5ca2f0 (patch) | |
| tree | 82533fbabef7565597b2eb663700369c99feef85 | |
| parent | 44d88f400141f67d57aa731c4829f804bf49d5b4 (diff) | |
| parent | 2eb62f91739157afc73f95d9992b4a1e2a2d7ddf (diff) | |
Merge pull request #190 from openscad/colorwarn
color>1.0 warning (color([255,0,0]) per Joel Bodenmann rept to mail list
| -rw-r--r-- | src/color.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/color.cc b/src/color.cc index 4220396..acca652 100644 --- a/src/color.cc +++ b/src/color.cc @@ -64,8 +64,11 @@ AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiatio Value v = c.lookup_variable("c"); if (v.type() == Value::VECTOR) { - for (size_t i = 0; i < 4; i++) + for (size_t i = 0; i < 4; i++) { node->color[i] = i < v.toVector().size() ? v.toVector()[i].toDouble() : 1.0; + if (node->color[i] > 1) + PRINTB_NOCACHE("WARNING: color() expects numbers between 0.0 and 1.0. Value of %.1f is too large.", node->color[i]); + } } else if (v.type() == Value::STRING) { std::string colorname = v.toString(); boost::algorithm::to_lower(colorname); |