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-06-15 18:45:49 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-15 18:45:49 +0400
commitf04546018f44ccaa038526cefc5fd2a212b2c20d (patch)
tree5364f988d74f06e745c7b5eced9b5b380e7e7d34 /source/blender/compositor/nodes
parent4f80c3464fab5d79a06ab5b56b2bea6fc72acef7 (diff)
style cleanup
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r--source/blender/compositor/nodes/COM_SplitViewerNode.cpp8
-rw-r--r--source/blender/compositor/nodes/COM_ViewLevelsNode.cpp12
-rw-r--r--source/blender/compositor/nodes/COM_ViewerNode.cpp8
3 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
index d7f61caf456..7e8a218cbc1 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
@@ -26,16 +26,16 @@
#include "COM_SplitViewerOperation.h"
#include "COM_ExecutionSystem.h"
-SplitViewerNode::SplitViewerNode(bNode *editorNode): Node(editorNode)
+SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode)
{
}
-void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{
InputSocket *image1Socket = this->getInputSocket(0);
InputSocket *image2Socket = this->getInputSocket(1);
- Image *image = (Image*)this->getbNode()->id;
- ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+ Image *image = (Image *)this->getbNode()->id;
+ ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
if (image1Socket->isConnected() && image2Socket->isConnected()) {
SplitViewerOperation *splitViewerOperation = new SplitViewerOperation();
splitViewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT);
diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
index cedf81e3f2a..a7974efe954 100644
--- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
@@ -26,21 +26,21 @@
#include "COM_CalculateMeanOperation.h"
#include "COM_CalculateStandardDeviationOperation.h"
-ViewLevelsNode::ViewLevelsNode(bNode *editorNode): Node(editorNode)
+ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode)
{
}
-void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{
- InputSocket * input = this->getInputSocket(0);
+ InputSocket *input = this->getInputSocket(0);
bool firstOperationConnected = false;
if (input->isConnected()) {
OutputSocket *inputSocket = input->getConnection()->getFromSocket();
// add preview to inputSocket;
- OutputSocket * socket = this->getOutputSocket(0);
+ OutputSocket *socket = this->getOutputSocket(0);
if (socket->isConnected()) {
// calculate mean operation
- CalculateMeanOperation * operation = new CalculateMeanOperation();
+ CalculateMeanOperation *operation = new CalculateMeanOperation();
input->relinkConnections(operation->getInputSocket(0), 0, graph);
firstOperationConnected = true;
operation->setSetting(this->getbNode()->custom1);
@@ -51,7 +51,7 @@ void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorConte
socket = this->getOutputSocket(1);
if (socket->isConnected()) {
// calculate standard deviation operation
- CalculateStandardDeviationOperation * operation = new CalculateStandardDeviationOperation();
+ CalculateStandardDeviationOperation *operation = new CalculateStandardDeviationOperation();
if (firstOperationConnected) {
addLink(graph, inputSocket, operation->getInputSocket(0));
}
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp
index 67c0df4d6a3..79c76f2e89e 100644
--- a/source/blender/compositor/nodes/COM_ViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp
@@ -26,16 +26,16 @@
#include "COM_ViewerOperation.h"
#include "COM_ExecutionSystem.h"
-ViewerNode::ViewerNode(bNode *editorNode): Node(editorNode)
+ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode)
{
}
-void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)\
+void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{
InputSocket *imageSocket = this->getInputSocket(0);
InputSocket *alphaSocket = this->getInputSocket(1);
- Image *image = (Image*)this->getbNode()->id;
- ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+ Image *image = (Image *)this->getbNode()->id;
+ ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
bNode *editorNode = this->getbNode();
if (imageSocket->isConnected()) {
ViewerOperation *viewerOperation = new ViewerOperation();