diff options
| -rw-r--r-- | intern/cycles/render/mesh_subdivision.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_boundbox.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp index 913c3c74b42..57c76a9f1c8 100644 --- a/intern/cycles/render/mesh_subdivision.cpp +++ b/intern/cycles/render/mesh_subdivision.cpp @@ -92,7 +92,7 @@ namespace Far { if(vert_edges.size() == 2) { float sharpness = refiner.getLevel(0).getEdgeSharpness(vert_edges[0]); - sharpness = min(sharpness, refiner.getLevel(0).getEdgeSharpness(vert_edges[1])); + sharpness = ccl::min(sharpness, refiner.getLevel(0).getEdgeSharpness(vert_edges[1])); setBaseVertexSharpness(refiner, i, sharpness); } diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h index 599222da9c5..dfe4977aef3 100644 --- a/intern/cycles/util/util_boundbox.h +++ b/intern/cycles/util/util_boundbox.h @@ -25,8 +25,6 @@ #include "util_transform.h" #include "util_types.h" -using namespace std; - CCL_NAMESPACE_BEGIN /* 3D BoundBox */ |