[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46865] trunk/blender/source/blender: style cleanup: brace placement.

[Campbell Barton]

Revision: 46865
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46865
Author:   campbellbarton
Date:     2012-05-22 06:29:46 +0000 (Tue, 22 May 2012)
Log Message:
-----------
style cleanup: brace placement.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ArmatureImporter.cpp
    trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
    trunk/blender/source/blender/gpu/intern/gpu_material.c

Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp	2012-05-22 05:18:53 UTC (rev 46864)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp	2012-05-22 06:29:46 UTC (rev 46865)
@@ -289,8 +289,10 @@
 		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( )

Modified: trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp	2012-05-22 05:18:53 UTC (rev 46864)
+++ trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp	2012-05-22 06:29:46 UTC (rev 46865)
@@ -47,18 +47,21 @@
 			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));

Modified: trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp	2012-05-22 05:18:53 UTC (rev 46864)
+++ trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp	2012-05-22 06:29:46 UTC (rev 46865)
@@ -241,7 +241,8 @@
 {
 	if (this->cached_buffer) {
 		return false;
-	} else {
+	}
+	else {
 		rcti newInput;
 	
 		newInput.xmax = getWidth();

Modified: trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.cpp	2012-05-22 05:18:53 UTC (rev 46864)
+++ trunk/blender/source/blender/compositor/operations/COM_GlareBaseOperation.cpp	2012-05-22 06:29:46 UTC (rev 46865)
@@ -74,7 +74,8 @@
 {
 	if (this->cachedInstance != NULL) {
 		return false;
-	} else {
+	}
+	else {
 		rcti newInput;
 		newInput.xmax = this->getWidth();
 		newInput.xmin = 0;

Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c	2012-05-22 05:18:53 UTC (rev 46864)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c	2012-05-22 06:29:46 UTC (rev 46865)
@@ -729,7 +729,8 @@
 					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),