Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-04-16 12:35:21 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-04-16 12:35:21 +0400
commit93df58160e56f81bb588a7df6a3a3d3d77365ce5 (patch)
treef53e6d8a7d2c7270f2ae3d53bd2d5f8ec5872153 /intern/cycles/util/util_boundbox.h
parent9cf2e5baf64a927325efeba5ed20c20dfec3da57 (diff)
Fix #30966: cycles nan mesh vertices got set to (0, 0, 0), now remove them instead.
Diffstat (limited to 'intern/cycles/util/util_boundbox.h')
-rw-r--r--intern/cycles/util/util_boundbox.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h
index 0114a9a26a5..bb1df0b220f 100644
--- a/intern/cycles/util/util_boundbox.h
+++ b/intern/cycles/util/util_boundbox.h
@@ -76,8 +76,8 @@ public:
bool valid(void) const
{
return (min.x <= max.x) && (min.y <= max.y) && (min.z <= max.z) &&
- !(isnan(min.x) || isnan(min.y) || isnan(min.z)) &&
- !(isnan(max.x) || isnan(max.y) || isnan(max.z));
+ (isfinite(min.x) && isfinite(min.y) && isfinite(min.z)) &&
+ (isfinite(max.x) && isfinite(max.y) && isfinite(max.z));
}
BoundBox transformed(const Transform *tfm)
@@ -91,7 +91,7 @@ public:
p.y = (i & 2)? min.y: max.y;
p.z = (i & 4)? min.z: max.z;
- result.grow(transform(tfm, p));
+ result.grow(transform_point(tfm, p));
}
return result;