[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54285] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Feb 4 01:05:16 CET 2013
Revision: 54285
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54285
Author: campbellbarton
Date: 2013-02-04 00:05:15 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/smoke/intern/FLUID_3D.cpp
trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
trunk/blender/source/blender/makesdna/DNA_rigidbody_types.h
trunk/blender/source/gameengine/GameLogic/SCA_IObject.h
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
Modified: trunk/blender/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -1055,7 +1055,7 @@
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
Modified: trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/blender/compositor/nodes/COM_GroupNode.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -58,7 +58,7 @@
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 @@
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);
}
Modified: trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -52,22 +52,22 @@
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()) {
Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -182,8 +182,8 @@
#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;
}
Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -184,8 +184,8 @@
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();
Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -133,8 +133,8 @@
}
{
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;
}
Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -136,8 +136,8 @@
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();
Modified: trunk/blender/source/blender/makesdna/DNA_rigidbody_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_rigidbody_types.h 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/blender/makesdna/DNA_rigidbody_types.h 2013-02-04 00:05:15 UTC (rev 54285)
@@ -76,11 +76,11 @@
/* 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;
/* ******************************** */
Modified: trunk/blender/source/gameengine/GameLogic/SCA_IObject.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IObject.h 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IObject.h 2013-02-04 00:05:15 UTC (rev 54285)
@@ -221,7 +221,7 @@
OBJ_ARMATURE=0,
OBJ_CAMERA=1,
OBJ_LIGHT=2,
- }ObjectTypes;
+ } ObjectTypes;
};
Modified: trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp 2013-02-04 00:02:26 UTC (rev 54284)
+++ trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp 2013-02-04 00:05:15 UTC (rev 54285)
@@ -238,8 +238,8 @@
{
parent->GetPhysicsController()->Jump();
}
- }else
- {
+ }
+ else {
if (!m_bitLocalFlag.ZeroForce)
{
parent->ApplyForce(m_force,(m_bitLocalFlag.Force) != 0);
More information about the Bf-blender-cvs
mailing list