[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51574] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Oct 24 11:07:55 CEST 2012
Revision: 51574
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51574
Author: campbellbarton
Date: 2012-10-24 09:07:54 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp
trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h
trunk/blender/source/blender/nodes/composite/nodes/node_composite_pixelate.c
Modified: trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp 2012-10-24 08:59:36 UTC (rev 51573)
+++ trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp 2012-10-24 09:07:54 UTC (rev 51574)
@@ -27,16 +27,16 @@
PixelateNode::PixelateNode(bNode *editorNode) : Node(editorNode)
{
- /* pass */
+ /* pass */
}
void PixelateNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{
- InputSocket *inputSocket = this->getInputSocket(0);
- OutputSocket *outputSocket = this->getOutputSocket(0);
-
- PixelateOperation *operation = new PixelateOperation(inputSocket->getDataType());
- inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
- outputSocket->relinkConnections(operation->getOutputSocket(0));
- graph->addOperation(operation);
+ InputSocket *inputSocket = this->getInputSocket(0);
+ OutputSocket *outputSocket = this->getOutputSocket(0);
+
+ PixelateOperation *operation = new PixelateOperation(inputSocket->getDataType());
+ inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
+ outputSocket->relinkConnections(operation->getOutputSocket(0));
+ graph->addOperation(operation);
}
Modified: trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h 2012-10-24 08:59:36 UTC (rev 51573)
+++ trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h 2012-10-24 09:07:54 UTC (rev 51574)
@@ -27,12 +27,12 @@
class PixelateOperation : public NodeOperation {
private:
- SocketReader *m_inputOperation;
+ SocketReader *m_inputOperation;
public:
- PixelateOperation(DataType dataType);
- void initExecution();
- void deinitExecution();
- void executePixel(float output[4], float x, float y, PixelSampler sampler);
+ PixelateOperation(DataType dataType);
+ void initExecution();
+ void deinitExecution();
+ void executePixel(float output[4], float x, float y, PixelSampler sampler);
};
#endif
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_pixelate.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_pixelate.c 2012-10-24 08:59:36 UTC (rev 51573)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_pixelate.c 2012-10-24 09:07:54 UTC (rev 51574)
@@ -37,21 +37,21 @@
/* **************** Pixelate ******************** */
static bNodeSocketTemplate cmp_node_pixelate_in[] = {
- { SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
- { -1, 0, "" }
+ { SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_pixelate_out[] = {
- { SOCK_RGBA, 0, N_("Color")},
- { -1, 0, "" }
+ { SOCK_RGBA, 0, N_("Color")},
+ { -1, 0, "" }
};
void register_node_type_cmp_pixelate(bNodeTreeType *ttype)
{
- static bNodeType ntype;
+ static bNodeType ntype;
- node_type_base(ttype, &ntype, CMP_NODE_PIXELATE, "Pixelate", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
- node_type_socket_templates(&ntype, cmp_node_pixelate_in, cmp_node_pixelate_out);
- node_type_size(&ntype, 130, 100, 130);
+ node_type_base(ttype, &ntype, CMP_NODE_PIXELATE, "Pixelate", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
+ node_type_socket_templates(&ntype, cmp_node_pixelate_in, cmp_node_pixelate_out);
+ node_type_size(&ntype, 130, 100, 130);
- nodeRegisterType(ttype, &ntype);
+ nodeRegisterType(ttype, &ntype);
}
More information about the Bf-blender-cvs
mailing list