diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 17:10:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 17:10:34 +0400 |
commit | 463898014f86d79ed096e10fa178d56641375456 (patch) | |
tree | 6cee076846bed36c0984550591a2ebbd37d61a18 /source | |
parent | a00cc81efb86921cb5c5db71c79528ec2c28d7a6 (diff) |
code cleanup: quiet warnings from compositor merge (builds with -Werror now in cmake)
Diffstat (limited to 'source')
4 files changed, 16 insertions, 5 deletions
diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp index c278ea877ba..8c1923b3236 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BlurNode.cpp @@ -35,8 +35,10 @@ BlurNode::BlurNode(bNode *editorNode): Node(editorNode) { void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) { bNode* editorNode = this->getbNode(); NodeBlurData * data = (NodeBlurData*)editorNode->storage; +#if 0 const bNodeSocket *sock = this->getInputSocket(1)->getbNodeSocket(); - //const float size = ((const bNodeSocketValueFloat*)sock->default_value)->value; + const float size = ((const bNodeSocketValueFloat*)sock->default_value)->value; +#endif CompositorQuality quality = context->getQuality(); diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp index 44accf42f6a..cb3d4be8834 100644 --- a/source/blender/compositor/nodes/COM_MuteNode.cpp +++ b/source/blender/compositor/nodes/COM_MuteNode.cpp @@ -70,7 +70,11 @@ void MuteNode::reconnect(ExecutionSystem * graph, OutputSocket * output) { operation = coloroperation; break; } + /* quiet warnings */ + case COM_DT_UNKNOWN: + break; } + if (operation) { output->relinkConnections(operation->getOutputSocket(), false); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp index 0622ed0ea84..6730036baf6 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp @@ -84,6 +84,9 @@ void OutputSocketProxyNode::convertToOperations(ExecutionSystem *graph, Composit graph->addOperation(operation); break; } + /* quiet warnings */ + case COM_DT_UNKNOWN: + break; } } } diff --git a/source/blender/compositor/operations/COM_LensGhostOperation.cpp b/source/blender/compositor/operations/COM_LensGhostOperation.cpp index eb957ca4756..37f0c776d9f 100644 --- a/source/blender/compositor/operations/COM_LensGhostOperation.cpp +++ b/source/blender/compositor/operations/COM_LensGhostOperation.cpp @@ -723,10 +723,12 @@ void LensGhostProjectionOperation::executePixel(float* color, float x, float y, void LensGhostOperation::executePixel(float* color, int x, int y, MemoryBuffer *inputBuffers[], void* data) { vector<LensFace*>* faces = (vector<LensFace*>*)data; - const float bokehWidth = bokehReader->getWidth(); - const float bokehHeight = bokehReader->getHeight(); - float bokeh[4]; - color[0] = 0.0f; +#if 0 /* UNUSED */ + const float bokehWidth = bokehReader->getWidth(); + const float bokehHeight = bokehReader->getHeight(); + float bokeh[4]; +#endif + color[0] = 0.0f; color[1] = 0.0f; color[2] = 0.0f; color[3] = 1.0f; |