Merge branch 'master' into temp-compact-node-prototypetemp-compact-node-prototype

1 files changed, 2 insertions, 4 deletions

diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h
index 581ee0a2340..23085d37a3f 100644
--- a/source/blender/freestyle/intern/view_map/BoxGrid.h
+++ b/source/blender/freestyle/intern/view_map/BoxGrid.h
@@ -73,8 +73,7 @@ class BoxGrid {
     // Cell(const Cell& other);
     // Cell& operator=(const Cell& other);
 
-    explicit Cell();
-    ~Cell();
+    explicit Cell() = default;
 
     static bool compareOccludersByShallowestPoint(const OccluderData *a, const OccluderData *b);
 
@@ -105,7 +104,6 @@ class BoxGrid {
     // epsilon is not used in this class, but other grids with the same interface may need an
     // epsilon
     explicit Iterator(BoxGrid &grid, Vec3r &center, real epsilon = 1.0e-06);
-    ~Iterator();
     void initBeforeTarget();
     void initAfterTarget();
     void nextOccluder();
@@ -134,7 +132,7 @@ class BoxGrid {
 
   class Transform : public GridHelpers::Transform {
    public:
-    explicit Transform();
+    explicit Transform() = default;
     explicit Transform(Transform &other);
     Vec3r operator()(const Vec3r &point) const;
   };