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

1 files changed, 9 insertions, 17 deletions

diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index aa7ba35ddee..64ab4c06e7c 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -27,6 +27,8 @@
 
 #include "intern/openexr/openexr_multi.h"
 
+namespace blender::compositor {
+
 /* Writes the image to a single-layer file. */
 class OutputSingleLayerOperation : public NodeOperation {
  protected:
@@ -64,14 +66,9 @@ class OutputSingleLayerOperation : public NodeOperation {
   }
   void initExecution() override;
   void deinitExecution() override;
-  CompositorPriority getRenderPriority() const override
-  {
-    return CompositorPriority::Low;
-  }
-
-  bool isFileOutputOperation() const override
+  eCompositorPriority getRenderPriority() const override
   {
-    return true;
+    return eCompositorPriority::Low;
   }
 };
 
@@ -91,8 +88,6 @@ struct OutputOpenExrLayer {
 /* Writes inputs into OpenEXR multilayer channels. */
 class OutputOpenExrMultiLayerOperation : public NodeOperation {
  protected:
-  typedef std::vector<OutputOpenExrLayer> LayerList;
-
   const Scene *m_scene;
   const RenderData *m_rd;
   const bNodeTree *m_tree;
@@ -100,7 +95,7 @@ class OutputOpenExrMultiLayerOperation : public NodeOperation {
   char m_path[FILE_MAX];
   char m_exr_codec;
   bool m_exr_half_float;
-  LayerList m_layers;
+  Vector<OutputOpenExrLayer> m_layers;
   const char *m_viewName;
 
   StampData *createStampData() const;
@@ -123,14 +118,9 @@ class OutputOpenExrMultiLayerOperation : public NodeOperation {
   }
   void initExecution() override;
   void deinitExecution() override;
-  CompositorPriority getRenderPriority() const override
+  eCompositorPriority getRenderPriority() const override
   {
-    return CompositorPriority::Low;
-  }
-
-  bool isFileOutputOperation() const override
-  {
-    return true;
+    return eCompositorPriority::Low;
   }
 };
 
@@ -146,3 +136,5 @@ void free_exr_channels(void *exrhandle,
                        const char *layerName,
                        const DataType datatype);
 int get_datatype_size(DataType datatype);
+
+}  // namespace blender::compositor