diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-25 23:38:03 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-25 23:38:03 (GMT) |
| commit | c4bffdaf37fdf72a84a225ec584d3698fe398857 (patch) | |
| tree | 503b819d69c00f007709cfee0f332c7adc7ad818 /src/CSGTermEvaluator.cc | |
| parent | 3e64e63b0113a99666ad68aa3e82bb7b80324d9b (diff) | |
Color overriding now works. The outermost color will win if multiple colors are specified for the same object
Diffstat (limited to 'src/CSGTermEvaluator.cc')
| -rw-r--r-- | src/CSGTermEvaluator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc index fc76d56..34f22da 100644 --- a/src/CSGTermEvaluator.cc +++ b/src/CSGTermEvaluator.cc @@ -159,7 +159,7 @@ Response CSGTermEvaluator::visit(State &state, const TransformNode &node) Response CSGTermEvaluator::visit(State &state, const ColorNode &node) { if (state.isPrefix()) { - state.setColor(node.color); + if (!state.color().isValid()) state.setColor(node.color); } if (state.isPostfix()) { applyToChildren(node, CSGT_UNION); |