[Bf-blender-cvs] [b0a7e77] master: Cleanup: style

[Campbell Barton]

Commit: b0a7e77700535a0fb021505f1920322d633926d4
Author: Campbell Barton
Date:   Wed Mar 23 04:47:16 2016 +1100
Branches: master
https://developer.blender.org/rBb0a7e77700535a0fb021505f1920322d633926d4

Cleanup: style

===================================================================

M	source/blender/blenkernel/intern/library.c
M	source/blender/gpu/intern/gpu_compositing.c
M	source/blender/gpu/intern/gpu_material.c

===================================================================

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 6d7a615..72801d6 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -194,8 +194,10 @@ void id_us_clear_real(ID *id)
 	}
 }
 
-/* Same as \a id_us_plus, but does not handle lib indirect -> extern.
- * Only used by readfile.c so far, but simpler/safer to keep it here nontheless. */
+/**
+ * Same as \a id_us_plus, but does not handle lib indirect -> extern.
+ * Only used by readfile.c so far, but simpler/safer to keep it here nonetheless.
+ */
 void id_us_plus_no_lib(ID *id)
 {
 	if (id) {
diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c
index c22f3ed..7534d9d 100644
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@ -61,8 +61,7 @@ static const float fullscreenuvs[4][2] = {{0.0f, 0.0f}, {1.0f, 0.0f}, {0.0f, 1.0
 
 /* shader interfaces (legacy GL 2 style, without uniform buffer objects) */
 
-typedef struct
-{
+typedef struct {
 	int ssao_uniform;
 	int ssao_color_uniform;
 	int color_uniform;
@@ -73,8 +72,7 @@ typedef struct
 	int ssao_jitter_uniform;
 } GPUSSAOShaderInterface;
 
-typedef struct
-{
+typedef struct {
 	int invrendertargetdim_uniform;
 	int color_uniform;
 	int dof_uniform;
@@ -82,8 +80,7 @@ typedef struct
 	int viewvecs_uniform;
 } GPUDOFHQPassOneInterface;
 
-typedef struct
-{
+typedef struct {
 	int rendertargetdim_uniform;
 	int color_uniform;
 	int coc_uniform;
@@ -91,8 +88,7 @@ typedef struct
 	int dof_uniform;
 } GPUDOFHQPassTwoInterface;
 
-typedef struct
-{
+typedef struct {
 	int dof_uniform;
 	int invrendertargetdim_uniform;
 	int color_uniform;
@@ -102,8 +98,7 @@ typedef struct
 	int depth_uniform;
 } GPUDOFHQPassThreeInterface;
 
-typedef struct
-{
+typedef struct {
 	int dof_uniform;
 	int invrendertargetdim_uniform;
 	int color_uniform;
@@ -111,8 +106,7 @@ typedef struct
 	int viewvecs_uniform;
 } GPUDOFPassOneInterface;
 
-typedef struct
-{
+typedef struct {
 	int dof_uniform;
 	int invrendertargetdim_uniform;
 	int color_uniform;
@@ -120,20 +114,17 @@ typedef struct
 	int viewvecs_uniform;
 } GPUDOFPassTwoInterface;
 
-typedef struct
-{
+typedef struct {
 	int near_coc_downsampled;
 	int near_coc_blurred;
 } GPUDOFPassThreeInterface;
 
-typedef struct
-{
+typedef struct {
 	int near_coc_downsampled;
 	int invrendertargetdim_uniform;
 } GPUDOFPassFourInterface;
 
-typedef struct
-{
+typedef struct {
 	int medium_blurred_uniform;
 	int high_blurred_uniform;
 	int dof_uniform;
@@ -143,8 +134,7 @@ typedef struct
 	int viewvecs_uniform;
 } GPUDOFPassFiveInterface;
 
-typedef struct
-{
+typedef struct {
 	int depth_uniform;
 } GPUDepthResolveInterface;
 
@@ -1332,8 +1322,7 @@ void GPU_fx_shader_init_interface(struct GPUShader *shader, GPUFXShaderEffect ef
 	if (!shader)
 		return;
 
-	switch (effect)
-	{
+	switch (effect) {
 		case GPU_SHADER_FX_SSAO:
 		{
 			GPUSSAOShaderInterface *interface = MEM_mallocN(sizeof(GPUSSAOShaderInterface), "GPUSSAOShaderInterface");
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index fefc18d..587e634 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -1312,7 +1312,7 @@ static void do_material_tex(GPUShadeInput *shi)
 					texture_rgb_blend(mat, tcol, shi->specrgb, tin, colspecfac, mtex->blendtype, &shi->specrgb);
 				}
 
-				if(mtex->mapto & MAP_COLMIR) {
+				if (mtex->mapto & MAP_COLMIR) {
 					GPUNodeLink *colmirfac;
 
 					if (mtex->mirrfac == 1.0f) colmirfac = stencil;