diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-16 03:45:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-16 03:45:41 +0400 |
commit | 761ac8987799050c860f2b649d626aaa4258a8bd (patch) | |
tree | 0c301d1aada48027322f2f37b8bfecd500a23629 /source/blender/compositor | |
parent | 769ab3eed81e8b14dff46af7ca28e2b70a7aac41 (diff) |
style cleanup
Diffstat (limited to 'source/blender/compositor')
-rw-r--r-- | source/blender/compositor/nodes/COM_ScaleNode.cpp | 22 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_ChannelMatteOperation.cpp | 15 |
2 files changed, 22 insertions, 15 deletions
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp index 6f7bd33db6f..e139eb83e04 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cpp +++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp @@ -43,7 +43,8 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c bNode *bnode = this->getbNode(); switch (bnode->custom1) { - case CMP_SCALE_RELATIVE: { + case CMP_SCALE_RELATIVE: + { ScaleOperation *operation = new ScaleOperation(); inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); @@ -51,9 +52,10 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph); scaleoperation = operation; + break; } - break; - case CMP_SCALE_SCENEPERCENT: { + case CMP_SCALE_SCENEPERCENT: + { SetValueOperation *scaleFactorOperation = new SetValueOperation(); scaleFactorOperation->setValue(context->getRenderData()->size / 100.0f); ScaleOperation *operation = new ScaleOperation(); @@ -63,10 +65,10 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c graph->addOperation(scaleFactorOperation); scaleoperation = operation; + break; } - break; - - case CMP_SCALE_RENDERPERCENT: { + case CMP_SCALE_RENDERPERCENT: + { const RenderData *rd = context->getRenderData(); ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation(); @@ -81,10 +83,10 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c operation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true); scaleoperation = operation; + break; } - break; - - case CMP_SCALE_ABSOLUTE: { + case CMP_SCALE_ABSOLUTE: + { ScaleAbsoluteOperation *operation = new ScaleAbsoluteOperation(); // TODO: what is the use of this one.... perhaps some issues when the ui was updated.... inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); @@ -92,8 +94,8 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph); scaleoperation = operation; + break; } - break; } outputSocket->relinkConnections(scaleoperation->getOutputSocket(0)); diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp index 234a1c7b1e5..84cc8aad950 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp @@ -38,7 +38,8 @@ void ChannelMatteOperation::initExecution() switch (this->m_limit_method) { /* SINGLE */ - case 0: { + case 0: + { /* 123 / RGB / HSV / YUV / YCC */ const int matte_channel = this->m_matte_channel - 1; const int limit_channel = this->m_limit_channel - 1; @@ -48,21 +49,25 @@ void ChannelMatteOperation::initExecution() break; } /* MAX */ - case 1: { + case 1: + { switch (this->m_matte_channel) { - case 1: { + case 1: + { this->m_ids[0] = 0; this->m_ids[1] = 1; this->m_ids[2] = 2; break; } - case 2: { + case 2: + { this->m_ids[0] = 1; this->m_ids[1] = 0; this->m_ids[2] = 2; break; } - case 3: { + case 3: + { this->m_ids[0] = 2; this->m_ids[1] = 0; this->m_ids[2] = 1; |