kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2013-02-04 00:05:15 +00:00
parent c584e01bee
commit 9d4be17de4
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/smoke/intern/FLUID_3D.cpp
View 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

4
source/blender/compositor/nodes/COM_GroupNode.cpp
View 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);
}

22
source/blender/compositor/nodes/COM_SocketProxyNode.cpp
View 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()) {

4
source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
View 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;
}

4
source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
View 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();

4
source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
View 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;
}

4
source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
View 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();

6
source/blender/makesdna/DNA_rigidbody_types.h
View 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;
/* ******************************** */

2
source/gameengine/GameLogic/SCA_IObject.h
View File

@ -221,7 +221,7 @@ public:
OBJ_ARMATURE=0,
OBJ_CAMERA=1,
OBJ_LIGHT=2,
}ObjectTypes;
} ObjectTypes;
};

4
source/gameengine/Ketsji/KX_ObjectActuator.cpp
View 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);