diff options
author | Jeroen Bakker <jeroen@blender.org> | 2021-03-30 09:23:09 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-03-30 17:03:43 +0300 |
commit | 3ead9b2b3605580554cc330d2d2525f405e9c779 (patch) | |
tree | 634650b941210833444cf0947eb4682c513e5d70 /source/blender/compositor/operations | |
parent | 5a6d5d20de2cfa43d14d67970b2f2eb24048b230 (diff) |
Cleanup: Replace virtual methods with bitflags.
Diffstat (limited to 'source/blender/compositor/operations')
6 files changed, 4 insertions, 28 deletions
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc index fd30f2fc610..9a1990740f4 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cc +++ b/source/blender/compositor/operations/COM_PreviewOperation.cc @@ -51,6 +51,7 @@ PreviewOperation::PreviewOperation(const ColorManagedViewSettings *viewSettings, this->m_defaultWidth = defaultWidth; this->m_defaultHeight = defaultHeight; flags.use_viewer_border = true; + flags.is_preview_operation = true; } void PreviewOperation::verifyPreview(bNodeInstanceHash *previews, bNodeInstanceKey key) diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index d310bf9b01a..5e2b27475a1 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -63,10 +63,6 @@ class PreviewOperation : public NodeOperation { bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) override; - bool isPreviewOperation() const override - { - return true; - } }; } // namespace blender::compositor diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.cc b/source/blender/compositor/operations/COM_SocketProxyOperation.cc index 5b5be17bf95..39876439b7b 100644 --- a/source/blender/compositor/operations/COM_SocketProxyOperation.cc +++ b/source/blender/compositor/operations/COM_SocketProxyOperation.cc @@ -21,10 +21,11 @@ namespace blender::compositor { SocketProxyOperation::SocketProxyOperation(DataType type, bool use_conversion) - : m_use_conversion(use_conversion) { this->addInputSocket(type); this->addOutputSocket(type); + flags.is_proxy_operation = true; + flags.use_datatype_conversion = use_conversion; } std::unique_ptr<MetaData> SocketProxyOperation::getMetaData() diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h index db621d29cac..27fb6e0f204 100644 --- a/source/blender/compositor/operations/COM_SocketProxyOperation.h +++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h @@ -26,27 +26,8 @@ class SocketProxyOperation : public NodeOperation { public: SocketProxyOperation(DataType type, bool use_conversion); - bool isProxyOperation() const override - { - return true; - } - bool useDatatypeConversion() const override - { - return m_use_conversion; - } - - bool getUseConversion() const - { - return m_use_conversion; - } - void setUseConversion(bool use_conversion) - { - m_use_conversion = use_conversion; - } std::unique_ptr<MetaData> getMetaData() override; - private: - bool m_use_conversion; }; } // namespace blender::compositor diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc index dc52a91ef87..1ae0fe6101f 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cc +++ b/source/blender/compositor/operations/COM_ViewerOperation.cc @@ -56,6 +56,7 @@ ViewerOperation::ViewerOperation() this->m_rd = nullptr; this->m_viewName = nullptr; flags.use_viewer_border = true; + flags.is_viewer_operation = true; } void ViewerOperation::initExecution() diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 2d3795da035..8406ea41f20 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -103,10 +103,6 @@ class ViewerOperation : public NodeOperation { return this->m_chunkOrder; } CompositorPriority getRenderPriority() const override; - bool isViewerOperation() const override - { - return true; - } void setUseAlphaInput(bool value) { this->m_useAlphaInput = value; |