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:44:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-17 17:44:15 +0400
commit979f6bab9c1aba27b8d018d1481987d841f68ee1 (patch)
tree162419d475bf68326b3b5e88b25f27057fee6831 /source/blender/compositor/intern/COM_InputSocket.cpp
parentfe0d1a381003408dedcd3142a727c77806617150 (diff)
style cleanup: braces, compositor
Diffstat (limited to 'source/blender/compositor/intern/COM_InputSocket.cpp')
-rw-r--r--source/blender/compositor/intern/COM_InputSocket.cpp29
1 files changed, 19 insertions, 10 deletions
diff --git a/source/blender/compositor/intern/COM_InputSocket.cpp b/source/blender/compositor/intern/COM_InputSocket.cpp
index 9596d5b73b0..8428544cbc2 100644
--- a/source/blender/compositor/intern/COM_InputSocket.cpp
+++ b/source/blender/compositor/intern/COM_InputSocket.cpp
@@ -48,9 +48,10 @@ void InputSocket::setConnection(SocketConnection *connection) {
SocketConnection* InputSocket::getConnection() {return this->connection;}
void InputSocket::determineResolution(unsigned int resolution[],unsigned int preferredResolution[]) {
- if (this->isConnected()){
+ if (this->isConnected()) {
this->connection->getFromSocket()->determineResolution(resolution, preferredResolution);
- } else {
+ }
+ else {
return;
}
}
@@ -67,19 +68,24 @@ DataType InputSocket::convertToSupportedDataType(DataType datatype) {
if (datatype == COM_DT_VALUE) {
if (candoColor) {
return COM_DT_COLOR;
- } else if (candoVector) {
+ }
+ else if (candoVector) {
return COM_DT_VECTOR;
}
- } else if (datatype == COM_DT_VECTOR) {
+ }
+ else if (datatype == COM_DT_VECTOR) {
if (candoColor) {
return COM_DT_COLOR;
- } else if (candoValue) {
+ }
+ else if (candoValue) {
return COM_DT_VALUE;
}
- } else if (datatype == COM_DT_COLOR) {
+ }
+ else if (datatype == COM_DT_COLOR) {
if (candoVector) {
return COM_DT_VECTOR;
- } else if (candoValue) {
+ }
+ else if (candoValue) {
return COM_DT_VALUE;
}
}
@@ -115,7 +121,8 @@ void InputSocket::relinkConnections(InputSocket *relinkToSocket) {
void InputSocket::relinkConnections(InputSocket *relinkToSocket, bool autoconnect, int editorNodeInputSocketIndex, bool duplicate, ExecutionSystem* graph) {
if (!duplicate) {
this->relinkConnections(relinkToSocket, autoconnect, editorNodeInputSocketIndex, graph);
- } else {
+ }
+ else {
if (!this->isConnected() && autoconnect) {
Node* node = (Node*)this->getNode();
switch (this->getActualDataType()) {
@@ -170,7 +177,8 @@ void InputSocket::relinkConnections(InputSocket *relinkToSocket, bool autoconnec
const ChannelInfo* InputSocket::getChannelInfo(const int channelnumber) {
if (this->isConnected() && this->connection->getFromSocket()) {
return this->connection->getFromSocket()->getChannelInfo(channelnumber);
- } else {
+ }
+ else {
return NULL;
}
}
@@ -191,7 +199,8 @@ SocketReader* InputSocket::getReader() {
NodeOperation* InputSocket::getOperation() const {
if (isConnected()) {
return (NodeOperation*)this->connection->getFromSocket()->getNode();
- } else {
+ }
+ else {
return NULL;
}
}