style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Feb 2013 00:05:15 +0000 (00:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Feb 2013 00:05:15 +0000 (00:05 +0000)
intern/smoke/intern/FLUID_3D.cpp
source/blender/compositor/nodes/COM_GroupNode.cpp
source/blender/compositor/nodes/COM_SocketProxyNode.cpp
source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
source/blender/makesdna/DNA_rigidbody_types.h
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/Ketsji/KX_ObjectActuator.cpp

index 4eb11a46f5bd90f0ba427bf05fb5c1e4c9091f91..a1d39286a90cc1e06b2e7676a93dac446e92777b 100644 (file)
@@ -1055,7 +1055,7 @@ void FLUID_3D::project()
                        for (x = 1; x < _xRes - 1; x++, index++)
                        {
                                float vMask[3] = {1.0f, 1.0f, 1.0f}, vObst[3] = {0, 0, 0};
-                               float vR = 0.0f, vL = 0.0f, vT = 0.0f, vB = 0.0f, vD = 0.0f, vU = 0.0f;
+                               // float vR = 0.0f, vL = 0.0f, vT = 0.0f, vB = 0.0f, vD = 0.0f, vU = 0.0f;  // UNUSED
 
                                float pC = _pressure[index]; // center
                                float pR = _pressure[index + 1]; // right
index 32190010aa686fc134ae8856eb25e9a6aaf18e24..4cef337d9949e48612488fbaac40ddbc095e4979 100644 (file)
@@ -58,7 +58,7 @@ void GroupNode::ungroup(ExecutionSystem &system)
                InputSocket *inputSocket = inputsockets[index];
                bNodeSocket *editorInput = inputSocket->getbNodeSocket();
                if (editorInput->groupsock) {
-            SocketProxyNode *proxy = new SocketProxyNode(bnode, editorInput, editorInput->groupsock, false);
+                       SocketProxyNode *proxy = new SocketProxyNode(bnode, editorInput, editorInput->groupsock, false);
                        inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
                        ExecutionSystemHelper::addNode(system.getNodes(), proxy);
                }
@@ -68,7 +68,7 @@ void GroupNode::ungroup(ExecutionSystem &system)
                OutputSocket *outputSocket = outputsockets[index];
                bNodeSocket *editorOutput = outputSocket->getbNodeSocket();
                if (editorOutput->groupsock) {
-            SocketProxyNode *proxy = new SocketProxyNode(bnode, editorOutput->groupsock, editorOutput, true);
+                       SocketProxyNode *proxy = new SocketProxyNode(bnode, editorOutput->groupsock, editorOutput, true);
                        outputSocket->relinkConnections(proxy->getOutputSocket(0));
                        ExecutionSystemHelper::addNode(system.getNodes(), proxy);
                }
index e6026675d2015a9564f2544e8eb540def29a612c..185fa502fcdb40bab79578d0e687c6012988ae7e 100644 (file)
@@ -52,22 +52,22 @@ void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorCont
        InputSocket *inputsocket = this->getInputSocket(0);
        if (outputsocket->isConnected()) {
                if (inputsocket->isConnected()) {
-            SocketProxyOperation *operation = new SocketProxyOperation(this->getOutputSocket()->getDataType());
+                       SocketProxyOperation *operation = new SocketProxyOperation(this->getOutputSocket()->getDataType());
                        inputsocket->relinkConnections(operation->getInputSocket(0));
                        outputsocket->relinkConnections(operation->getOutputSocket(0));
                        graph->addOperation(operation);
-            if (m_buffer){
-                WriteBufferOperation * writeOperation = new WriteBufferOperation();
-                ReadBufferOperation * readOperation = new ReadBufferOperation();
-                readOperation->setMemoryProxy(writeOperation->getMemoryProxy());
+                       if (m_buffer) {
+                               WriteBufferOperation *writeOperation = new WriteBufferOperation();
+                               ReadBufferOperation *readOperation = new ReadBufferOperation();
+                               readOperation->setMemoryProxy(writeOperation->getMemoryProxy());
 
-                operation->getOutputSocket()->relinkConnections(readOperation->getOutputSocket());
-                addLink(graph, operation->getOutputSocket(), writeOperation->getInputSocket(0));
+                               operation->getOutputSocket()->relinkConnections(readOperation->getOutputSocket());
+                               addLink(graph, operation->getOutputSocket(), writeOperation->getInputSocket(0));
 
-                graph->addOperation(writeOperation);
-                graph->addOperation(readOperation);
-            }
-        }
+                               graph->addOperation(writeOperation);
+                               graph->addOperation(readOperation);
+                       }
+               }
                else {
                        /* If input is not connected, add a constant value operation instead */
                        switch (outputsocket->getDataType()) {
index 08a777f02332bf42cddf70db67ae6704b74a970b..aaf5f92505b6a3af17d744a3eaf7cee0b5783e96 100644 (file)
@@ -182,8 +182,8 @@ bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti *input,
 #endif
        {
                if (this->m_sizeavailable && this->m_gausstab != NULL) {
-            newInput.xmax = input->xmax + this->m_rad + 1;
-            newInput.xmin = input->xmin - this->m_rad - 1;
+                       newInput.xmax = input->xmax + this->m_rad + 1;
+                       newInput.xmin = input->xmin - this->m_rad - 1;
                        newInput.ymax = input->ymax;
                        newInput.ymin = input->ymin;
                }
index 1448d84b747893b683a8fe9a0b1fbeae8b24e22d..650805f91d566e98a5294a8b31f71b10525d303b 100644 (file)
@@ -184,8 +184,8 @@ bool GaussianAlphaYBlurOperation::determineDependingAreaOfInterest(rcti *input,
                if (this->m_sizeavailable && this->m_gausstab != NULL) {
                        newInput.xmax = input->xmax;
                        newInput.xmin = input->xmin;
-            newInput.ymax = input->ymax + this->m_rad + 1;
-            newInput.ymin = input->ymin - this->m_rad - 1;
+                       newInput.ymax = input->ymax + this->m_rad + 1;
+                       newInput.ymin = input->ymin - this->m_rad - 1;
                }
                else {
                        newInput.xmax = this->getWidth();
index d8497fafa04d168714add86247ae34ae9f6f1382..af231d118a688d6a0e35aebeaae3ba3cbcdd10d8 100644 (file)
@@ -133,8 +133,8 @@ bool GaussianXBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadB
        }
        {
                if (this->m_sizeavailable && this->m_gausstab != NULL) {
-            newInput.xmax = input->xmax + this->m_rad + 1;
-            newInput.xmin = input->xmin - this->m_rad - 1;
+                       newInput.xmax = input->xmax + this->m_rad + 1;
+                       newInput.xmin = input->xmin - this->m_rad - 1;
                        newInput.ymax = input->ymax;
                        newInput.ymin = input->ymin;
                }
index 72bc8ca7b01e010badcbe38c0a29e114accede36..7bf85a953f4269aac48d27dfaceca35de68f5e8e 100644 (file)
@@ -136,8 +136,8 @@ bool GaussianYBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadB
                if (this->m_sizeavailable && this->m_gausstab != NULL) {
                        newInput.xmax = input->xmax;
                        newInput.xmin = input->xmin;
-            newInput.ymax = input->ymax + this->m_rad + 1;
-            newInput.ymin = input->ymin - this->m_rad - 1;
+                       newInput.ymax = input->ymax + this->m_rad + 1;
+                       newInput.ymin = input->ymin - this->m_rad - 1;
                }
                else {
                        newInput.xmax = this->getWidth();
index b70687be7259d60d787bd2538736e9b67aa1511e..ca703130edc6b3d83d25e979d9d2cd69fbe05802 100644 (file)
@@ -76,11 +76,11 @@ typedef struct RigidBodyWorld {
 /* Flags for RigidBodyWorld */
 typedef enum eRigidBodyWorld_Flag {
        /* should sim world be skipped when evaluating (user setting) */
-       RBW_FLAG_MUTED                          = (1<<0),
+       RBW_FLAG_MUTED                          = (1 << 0),
        /* sim data needs to be rebuilt */
-       RBW_FLAG_NEEDS_REBUILD          = (1<<1),
+       RBW_FLAG_NEEDS_REBUILD          = (1 << 1),
        /* usse split impulse when stepping the simulation */
-       RBW_FLAG_USE_SPLIT_IMPULSE      = (1<<2)
+       RBW_FLAG_USE_SPLIT_IMPULSE      = (1 << 2)
 } eRigidBodyWorld_Flag;
 
 /* ******************************** */
index 0189af0032251ea01f54052b9dc60f587261e4af..365e2b0c8539204cd71bcdfb2ce52be81dedbdfc 100644 (file)
@@ -221,7 +221,7 @@ public:
                OBJ_ARMATURE=0,
                OBJ_CAMERA=1,
                OBJ_LIGHT=2,
-       }ObjectTypes;
+       } ObjectTypes;
 
 };
 
index 16e4cade280986e1db9577798aced93f70d38f5b..9355ad0adfd39285299da420c47db67d5b361b28 100644 (file)
@@ -238,8 +238,8 @@ bool KX_ObjectActuator::Update()
                        {
                                parent->GetPhysicsController()->Jump();
                        }
-               }else
-               {
+               }
+               else {
                        if (!m_bitLocalFlag.ZeroForce)
                        {
                                parent->ApplyForce(m_force,(m_bitLocalFlag.Force) != 0);