[Bf-blender-cvs] [dde3ecc1a88] blender-v2.92-release: Cleanup: compiler warnings
Brecht Van Lommel
noreply at git.blender.org
Tue Jan 26 15:55:51 CET 2021
Commit: dde3ecc1a88f1838a77917d92341a0078b55c47e
Author: Brecht Van Lommel
Date: Tue Jan 26 15:23:17 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rBdde3ecc1a88f1838a77917d92341a0078b55c47e
Cleanup: compiler warnings
If one method is marked as override, clang warns if others are not.
===================================================================
M source/blender/compositor/operations/COM_RenderLayersProg.h
M source/blender/compositor/operations/COM_SocketProxyOperation.h
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list