blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cycles: Remove using namespace hell 

Please NEVER EVER use such a statement, it's only causing HUGE
issues. What is even worse: it's not always possible to immediately
see that the hell is coming from such a statement.

There is still some statements in the existing code, will leave
those for a later cleanup.
This commit is contained in:
Sergey Sharybin 2017-01-19 14:24:14 +01:00
parent 83d7c64bc9
commit 46926b4b11
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/mesh_subdivision.cpp
View File

@ -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);
}

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

@ -25,8 +25,6 @@
#include "util_transform.h"
#include "util_types.h"
using namespace std;
CCL_NAMESPACE_BEGIN
/* 3D BoundBox */