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:
Diffstat (limited to 'intern/cycles/util/util_boundbox.h')
-rw-r--r--intern/cycles/util/util_boundbox.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h
index 24ea3655576..0114a9a26a5 100644
--- a/intern/cycles/util/util_boundbox.h
+++ b/intern/cycles/util/util_boundbox.h
@@ -19,12 +19,15 @@
#ifndef __UTIL_BOUNDBOX_H__
#define __UTIL_BOUNDBOX_H__
+#include <math.h>
#include <float.h>
-#include <cmath>
+#include "util_math.h"
#include "util_transform.h"
#include "util_types.h"
+using namespace std;
+
CCL_NAMESPACE_BEGIN
class BoundBox
@@ -73,8 +76,8 @@ public:
bool valid(void) const
{
return (min.x <= max.x) && (min.y <= max.y) && (min.z <= max.z) &&
- !(std::isnan(min.x) || std::isnan(min.y) || std::isnan(min.z)) &&
- !(std::isnan(max.x) || std::isnan(max.y) || std::isnan(max.z));
+ !(isnan(min.x) || isnan(min.y) || isnan(min.z)) &&
+ !(isnan(max.x) || isnan(max.y) || isnan(max.z));
}
BoundBox transformed(const Transform *tfm)