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

[Campbell Barton]

Commit: b82d571c85abe3e7631d2966115dcae2bb076be6
Author: Campbell Barton
Date:   Tue Apr 21 15:53:32 2015 +1000
Branches: master
https://developer.blender.org/rBb82d571c85abe3e7631d2966115dcae2bb076be6

Cleanup: style

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

M	intern/cycles/kernel/shaders/node_image_texture.osl
M	intern/cycles/kernel/shaders/node_math.osl
M	source/blender/editors/space_image/image_buttons.c
M	source/blender/gpu/intern/gpu_draw.c
M	source/blender/nodes/composite/node_composite_util.c

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

diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl
index 526a875..46a02ca 100644
--- a/intern/cycles/kernel/shaders/node_image_texture.osl
+++ b/intern/cycles/kernel/shaders/node_image_texture.osl
@@ -26,7 +26,7 @@ point map_to_tube(vector dir)
 {
 	float u, v;
 	v = (dir[2] + 1.0) * 0.5;
-	float len = sqrt(dir[0]*dir[0] + dir[1]*dir[1]);
+	float len = sqrt(dir[0] * dir[0] + dir[1] * dir[1]);
 	if (len > 0.0) {
 		u = (1.0 - (atan2(dir[0] / len, dir[1] / len) / M_PI)) * 0.5;
 	}
@@ -40,8 +40,8 @@ point map_to_sphere(vector dir)
 {
 	float len = length(dir);
 	float v, u;
-	if(len > 0.0) {
-		if(dir[0] == 0.0 && dir[1] == 0.0) {
+	if (len > 0.0) {
+		if (dir[0] == 0.0 && dir[1] == 0.0) {
 			u = 0.0;  /* Othwise domain error. */
 		}
 		else {
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl
index bbc008b..7eef97f 100644
--- a/intern/cycles/kernel/shaders/node_math.osl
+++ b/intern/cycles/kernel/shaders/node_math.osl
@@ -93,8 +93,8 @@ shader node_math(
 		Value = Value1 > Value2;
 	else if (type == "Modulo")
 		Value = safe_modulo(Value1, Value2);
-    else if (type == "Absolute")
-        Value = fabs(Value1);
+	else if (type == "Absolute")
+		Value = fabs(Value1);
 
 	if (Clamp)
 		Value = clamp(Value, 0.0, 1.0);
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index c398d32..2e9c2d9 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -580,7 +580,7 @@ static void image_multi_decpass_cb(bContext *C, void *rr_v, void *iuser_v)
 	ImageUser *iuser = iuser_v;
 	RenderLayer *rl;
 	RenderPass *rp;
-	RenderPass *prev= NULL;
+	RenderPass *prev = NULL;
 	int layer = iuser->layer;
 
 	if (RE_HasFakeLayer(rr))
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index daf6b90..7d41746 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -117,7 +117,7 @@ void GPU_render_text(MTFace *tface, int mode,
 		
 		/* color has been set */
 		if (tface->mode & TF_OBCOL)
-			col= NULL;
+			col = NULL;
 		else if (!col)
 			glColor3f(1.0f, 1.0f, 1.0f);
 
diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index 8e279cf..bbfb07a 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -43,7 +43,7 @@ void cmp_node_update_default(bNodeTree *UNUSED(ntree), bNode *node)
 	for (sock = node->outputs.first; sock; sock = sock->next) {
 		if (sock->cache) {
 			//free_compbuf(sock->cache);
-			//sock->cache= NULL;
+			//sock->cache = NULL;
 		}
 	}
 	node->need_exec = 1;