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:
authorCampbell Barton <ideasman42@gmail.com>2012-05-17 17:10:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-17 17:10:34 +0400
commit463898014f86d79ed096e10fa178d56641375456 (patch)
tree6cee076846bed36c0984550591a2ebbd37d61a18 /source/blender/compositor/nodes
parenta00cc81efb86921cb5c5db71c79528ec2c28d7a6 (diff)
code cleanup: quiet warnings from compositor merge (builds with -Werror now in cmake)
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r--source/blender/compositor/nodes/COM_BlurNode.cpp4
-rw-r--r--source/blender/compositor/nodes/COM_MuteNode.cpp4
-rw-r--r--source/blender/compositor/nodes/COM_SocketProxyNode.cpp3
3 files changed, 10 insertions, 1 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;
}
}
}