blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: compiler warnings 

If one method is marked as override, clang warns if others are not.
This commit is contained in:
Brecht Van Lommel 2021-01-26 15:23:17 +01:00
parent 76ab0381d1
commit dde3ecc1a8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/compositor/operations/COM_RenderLayersProg.h
View File

@ -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;
};

4
source/blender/compositor/operations/COM_SocketProxyOperation.h
View File

@ -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;
}