Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-01-26 17:23:17 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-01-26 17:52:05 +0300
commitdde3ecc1a88f1838a77917d92341a0078b55c47e (patch)
tree1a5b88ea9dc5cd2898bd5c5f4756b222154e4434 /source/blender/compositor
parent76ab0381d1e5f8df6b23803b75b2013933484bcd (diff)
Cleanup: compiler warnings
If one method is marked as override, clang warns if others are not.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_RenderLayersProg.h9
-rw-r--r--source/blender/compositor/operations/COM_SocketProxyOperation.h4
2 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h
index ec98969b223..a0d5bc2953b 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.h
@@ -68,7 +68,8 @@ class RenderLayersProg : public NodeOperation {
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
/**
* retrieve the reference to the float buffer of the renderer.
@@ -118,9 +119,9 @@ class RenderLayersProg : public NodeOperation {
{
return this->m_viewName;
}
- void initExecution();
- void deinitExecution();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void initExecution() override;
+ void deinitExecution() override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
std::unique_ptr<MetaData> getMetaData() const override;
};
diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h
index 435083f5008..712347a8ea2 100644
--- a/source/blender/compositor/operations/COM_SocketProxyOperation.h
+++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h
@@ -24,11 +24,11 @@ class SocketProxyOperation : public NodeOperation {
public:
SocketProxyOperation(DataType type, bool use_conversion);
- bool isProxyOperation() const
+ bool isProxyOperation() const override
{
return true;
}
- bool useDatatypeConversion() const
+ bool useDatatypeConversion() const override
{
return m_use_conversion;
}