diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-02 07:55:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-02 08:12:33 +0300 |
| commit | 77667ad80f39e608d625ddae07914a9f42a4ed86 (patch) | |
| tree | c4c99cbbc961d369f00725c3839da2e4026cbc64 /source/blender/freestyle/intern/view_map | |
| parent | efc7c355b2e4fcbf4261675d174f04e02fef3fed (diff) | |
Cleanup
Diffstat (limited to 'source/blender/freestyle/intern/view_map')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/BoxGrid.cpp | 4 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/view_map/BoxGrid.h | 4 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/view_map/SphericalGrid.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.cpp b/source/blender/freestyle/intern/view_map/BoxGrid.cpp index de60cc3812f..ae22a26ec9b 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.cpp +++ b/source/blender/freestyle/intern/view_map/BoxGrid.cpp @@ -76,13 +76,13 @@ BoxGrid::Iterator::Iterator (BoxGrid& grid, Vec3r& center, real /*epsilon*/) { // Find target cell _cell = grid.findCell(_target); - #if BOX_GRID_LOGGING +#if BOX_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { cout << "Searching for occluders of edge centered at " << _target << " in cell [" << 1_cell->boundary[0] << ", " << _cell->boundary[1] << ", " << _cell->boundary[2] << ", " << _cell->boundary[3] << "] (" << _cell->faces.size() << " occluders)" << endl; } - #endif +#endif // Set iterator _current = _cell->faces.begin(); diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h index 0ef4ce37b11..b8e751d041d 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.h +++ b/source/blender/freestyle/intern/view_map/BoxGrid.h @@ -303,11 +303,11 @@ inline void BoxGrid::Iterator::reportDepth(Vec3r origin, Vec3r u, real t) // The reported depth is the length of a ray in camera space // We need to convert it into a Z-value in grid space real depth = -(origin + (u * t))[2]; - #if BOX_GRID_LOGGING +#if BOX_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { std::cout << "\t\tReporting depth of occluder/ee: " << depth; } - #endif +#endif if (depth > _target[2]) { #if BOX_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp index fedd5767e32..10c88190cb3 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp @@ -77,13 +77,13 @@ SphericalGrid::Iterator::Iterator(SphericalGrid& grid, Vec3r& center, real /*eps { // Find target cell _cell = grid.findCell(_target); - #if SPHERICAL_GRID_LOGGING +#if SPHERICAL_GRID_LOGGING if (G.debug & G_DEBUG_FREESTYLE) { cout << "Searching for occluders of edge centered at " << _target << " in cell [" << _cell->boundary[0] << ", " << _cell->boundary[1] << ", " << _cell->boundary[2] << ", " << _cell->boundary[3] << "] (" << _cell->faces.size() << " occluders)" << endl; } - #endif +#endif // Set iterator _current = _cell->faces.begin(); |