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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-22 10:29:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-22 10:29:46 +0400
commit72f38b4f097120e6d4c5b3b0c9aceda7d1782583 (patch)
treeb5bb0799f93a83d974d70ce66357f55fb063b77e /source
parent5f95f7d2adb25ef7b821ec08f7f627664152d0b4 (diff)
style cleanup: brace placement.
Diffstat (limited to 'source')
-rw-r--r--source/blender/collada/ArmatureImporter.cpp4
-rw-r--r--source/blender/compositor/nodes/COM_DilateErodeNode.cpp9
-rw-r--r--source/blender/compositor/operations/COM_DilateErodeOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_GlareBaseOperation.cpp3
-rw-r--r--source/blender/gpu/intern/gpu_material.c3
5 files changed, 15 insertions, 7 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 97de7590d07..f23b2bf4b02 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -289,8 +289,10 @@ void ArmatureImporter::add_leaf_bone(float mat[][4], EditBone *bone, COLLADAFW:
float vec[3] = {x, y, z};
copy_v3_v3(leaf.bone->tail, leaf.bone->head);
add_v3_v3v3(leaf.bone->tail, leaf.bone->head, vec);
- }else
+ }
+ else {
leaf_bones.push_back(leaf);
+ }
}
void ArmatureImporter::fix_leaf_bones( )
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
index 55759ba410f..8f53c1ff8cc 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
+++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
@@ -47,18 +47,21 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont
addLink(graph, operation->getOutputSocket(), antiAlias->getInputSocket(0));
this->getOutputSocket(0)->relinkConnections(antiAlias->getOutputSocket(0));
graph->addOperation(antiAlias);
- } else {
+ }
+ else {
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
}
graph->addOperation(operation);
- } else {
+ }
+ else {
if (editorNode->custom2 > 0) {
DilateStepOperation * operation = new DilateStepOperation();
operation->setIterations(editorNode->custom2);
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0));
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
graph->addOperation(operation);
- } else {
+ }
+ else {
ErodeStepOperation * operation = new ErodeStepOperation();
operation->setIterations(-editorNode->custom2);
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0));
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
index 0dc4ea84cb8..a73f76030ab 100644
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
@@ -241,7 +241,8 @@ bool DilateStepOperation::determineDependingAreaOfInterest(rcti *input, ReadBuff
{
if (this->cached_buffer) {
return false;
- } else {
+ }
+ else {
rcti newInput;
newInput.xmax = getWidth();
diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.cpp b/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
index 44f987b45e3..fdfd19a10ae 100644
--- a/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
@@ -74,7 +74,8 @@ bool GlareBaseOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
{
if (this->cachedInstance != NULL) {
return false;
- } else {
+ }
+ else {
rcti newInput;
newInput.xmax = this->getWidth();
newInput.xmin = 0;
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 7ccb25e6cf6..31008ff8685 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -729,7 +729,8 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
GPU_dynamic_texture(lamp->tex, GPU_DYNAMIC_SAMPLER_2DSHADOW, lamp->ob),
GPU_dynamic_uniform((float*)lamp->dynpersmat, GPU_DYNAMIC_LAMP_DYNPERSMAT, lamp->ob),
GPU_uniform(&lamp->bias), GPU_uniform(&lamp->la->bleedbias), inp, &shadfac);
- } else {
+ }
+ else {
GPU_link(mat, "test_shadowbuf",
GPU_builtin(GPU_VIEW_POSITION),
GPU_dynamic_texture(lamp->tex, GPU_DYNAMIC_SAMPLER_2DSHADOW, lamp->ob),