diff options
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
-rw-r--r-- | source/blender/freestyle/intern/geometry/FastGrid.cpp | 2 | ||||
-rw-r--r-- | source/blender/freestyle/intern/geometry/Grid.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp index 1e5707690a0..1e0ae06da19 100644 --- a/source/blender/freestyle/intern/geometry/FastGrid.cpp +++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp @@ -40,7 +40,7 @@ void FastGrid::clear() } } delete[] _cells; - _cells = NULL; + _cells = nullptr; _cells_size = 0; Grid::clear(); diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp index 46e91197764..fad5a63ea4f 100644 --- a/source/blender/freestyle/intern/geometry/Grid.cpp +++ b/source/blender/freestyle/intern/geometry/Grid.cpp @@ -75,7 +75,7 @@ void firstIntersectionGridVisitor::examineOccluder(Polygon3r *occ) } } else { - occ->userdata2 = 0; + occ->userdata2 = nullptr; } } } @@ -321,11 +321,11 @@ void Grid::castInfiniteRay(const Vec3r &orig, Polygon3r *Grid::castRayToFindFirstIntersection( const Vec3r &orig, const Vec3r &dir, double &t, double &u, double &v, unsigned timestamp) { - Polygon3r *occluder = 0; + Polygon3r *occluder = nullptr; Vec3r end = Vec3r(orig + FLT_MAX * dir / dir.norm()); bool inter = initInfiniteRay(orig, dir, timestamp); if (!inter) { - return 0; + return nullptr; } firstIntersectionGridVisitor visitor(orig, dir, _cell_size); castRayInternal(visitor); |