summaryrefslogtreecommitdiff
path: root/src/CGALEvaluator.cc
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2012-08-21 01:10:06 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2012-08-21 01:10:06 (GMT)
commitd831b44474b4b3220d884306fd29aaf0cb5810fe (patch)
tree9d3399d0d931eac8a90c848571f0350ee4569188 /src/CGALEvaluator.cc
parent69f90c13bb7826fc2da6f1f5c35ab3ac550fc6da (diff)
clarify warning message
Diffstat (limited to 'src/CGALEvaluator.cc')
-rw-r--r--src/CGALEvaluator.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc
index 75b9097..ac6190f 100644
--- a/src/CGALEvaluator.cc
+++ b/src/CGALEvaluator.cc
@@ -241,12 +241,9 @@ Response CGALEvaluator::visit(State &state, const TransformNode &node)
// First union all children
N = applyToChildren(node, CGE_UNION);
- if ( matrix_contains_infinity( node.matrix ) ) {
- PRINT("Warning: Transformation matrix contains Infinity - removing object.");
- N.reset();
- }
- if ( matrix_contains_nan( node.matrix ) ) {
- PRINT("Warning: Transformation matrix contains Not-a-Number - removing object");
+ if ( matrix_contains_infinity( node.matrix ) || matrix_contains_nan( node.matrix ) ) {
+ // due to the way parse/eval works we can't currently distinguish between NaN and Inf
+ PRINT("Warning: Transformation matrix contains Not-a-Number and/or Infinity - removing object.");
N.reset();
}
contact: Jan Huwald // Impressum