kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix cycles compile issue after last commit.

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-12-03 21:27:19 +00:00
parent 03b807e7dc
commit 341aa730bd
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/app/cycles_xml.cpp
View File

@ -454,7 +454,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
xml_read_ustring(&attr->attribute, node, "attribute");
snode = attr;
}
else if(string_ieuals(node.name(), "camera")) {
else if(string_iequals(node.name(), "camera")) {
snode = new CameraNode();
}
else if(string_iequals(node.name(), "fresnel")) {

6
intern/cycles/util/util_boundbox.h
View File

@ -20,8 +20,8 @@
#define __UTIL_BOUNDBOX_H__
#include <float.h>
#include <cmath>
#include "util_math.h"
#include "util_transform.h"
#include "util_types.h"
@ -73,8 +73,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));
!(std::isnan(min.x) || std::isnan(min.y) || std::isnan(min.z)) &&
!(std::isnan(max.x) || std::isnan(max.y) || std::isnan(max.z));
}
BoundBox transformed(const Transform *tfm)

1
intern/cycles/util/util_math.h
View File

@ -63,7 +63,6 @@ CCL_NAMESPACE_BEGIN
#if(!defined(FREE_WINDOWS))
#define copysignf(x, y) ((float)_copysign(x, y))
#define hypotf(x, y) _hypotf(x, y)
#define isnan(x) _isnan(x)
#endif
#endif