Merge branch 'master' into ui-asset-view-templateui-asset-view-template

1 files changed, 8 insertions, 3 deletions

diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h
index 56dacc96710..7937ebd69dc 100644
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.h
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h
@@ -25,6 +25,8 @@
 
 #include "BLI_simd.h"
 
+namespace blender::compositor {
+
 class BlurBaseOperation : public NodeOperation, public QualityStepHelper {
  private:
  protected:
@@ -53,12 +55,12 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper {
   /**
    * Initialize the execution
    */
-  void initExecution();
+  void initExecution() override;
 
   /**
    * Deinitialize the execution
    */
-  void deinitExecution();
+  void deinitExecution() override;
 
   void setData(const NodeBlurData *data);
 
@@ -73,5 +75,8 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper {
     this->m_extend_bounds = extend_bounds;
   }
 
-  void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+  void determineResolution(unsigned int resolution[2],
+                           unsigned int preferredResolution[2]) override;
 };
+
+}  // namespace blender::compositor