[Bf-blender-cvs] [be6b3923f57] master: Compositor: silence clang/clang-tidy override warnings
Ankit Meel
noreply at git.blender.org
Tue Mar 9 14:49:52 CET 2021
Commit: be6b3923f5732e3da9d1ef432c092d90f9343fdf
Author: Ankit Meel
Date: Tue Mar 9 19:19:08 2021 +0530
Branches: master
https://developer.blender.org/rBbe6b3923f5732e3da9d1ef432c092d90f9343fdf
Compositor: silence clang/clang-tidy override warnings
`-Winconsistent-missing-override` and `modernize-use-override`.
Reviewed By: jbakker
Differential Revision: https://developer.blender.org/D10654
===================================================================
M source/blender/compositor/operations/COM_MultilayerImageOperation.h
===================================================================
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h
index f5176b0a4db..bfc59cabdbf 100644
--- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h
+++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h
@@ -28,7 +28,7 @@ class MultilayerBaseOperation : public BaseImageOperation {
protected:
RenderLayer *m_renderLayer;
RenderPass *m_renderPass;
- ImBuf *getImBuf();
+ ImBuf *getImBuf() override;
public:
/**
@@ -44,7 +44,7 @@ class MultilayerColorOperation : public MultilayerBaseOperation {
{
this->addOutputSocket(COM_DT_COLOR);
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
std::unique_ptr<MetaData> getMetaData() const override;
};
@@ -55,7 +55,7 @@ class MultilayerValueOperation : public MultilayerBaseOperation {
{
this->addOutputSocket(COM_DT_VALUE);
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MultilayerVectorOperation : public MultilayerBaseOperation {
@@ -65,5 +65,5 @@ class MultilayerVectorOperation : public MultilayerBaseOperation {
{
this->addOutputSocket(COM_DT_VECTOR);
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
More information about the Bf-blender-cvs
mailing list