style cleanup: assignment & indentation.

6 files changed, 16 insertions, 10 deletions

diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index c1a089cc872..5c7966d6d96 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -74,10 +74,13 @@ bool Attribute::same_storage(TypeDesc a, TypeDesc b)
 	
 	if(a == TypeDesc::TypeColor || a == TypeDesc::TypePoint ||
 	   a == TypeDesc::TypeVector || a == TypeDesc::TypeNormal)
+	{
 		if(b == TypeDesc::TypeColor || b == TypeDesc::TypePoint ||
 		   b == TypeDesc::TypeVector || b == TypeDesc::TypeNormal)
+		{
 			return true;
-	
+		}
+	}
 	return false;
 }
 
@@ -286,10 +289,13 @@ bool AttributeRequestSet::modified(const AttributeRequestSet& other)
 		for(size_t j = 0; j < requests.size() && !found; j++)
 			if(requests[i].name == other.requests[j].name &&
 			   requests[i].std == other.requests[j].std)
+			{
 				found = true;
+			}
 
-		if(!found)
+		if(!found) {
 			return true;
+		}
 	}
 
 	return false;
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index a7fd47c94cf..a79a3591e0f 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -117,8 +117,8 @@ void RenderBuffers::reset(Device *device, BufferParams& params_)
 	uint *init_state = rng_state.resize(params.width, params.height);
 	int x, y, width = params.width, height = params.height;
 	
-	for(x=0; x<width; x++)
-		for(y=0; y<height; y++)
+	for(x = 0; x < width; x++)
+		for(y = 0; y < height; y++)
 			init_state[x + y*width] = hash_int_2d(params.full_x+x, params.full_y+y);
 
 	device->mem_alloc(rng_state, MEM_READ_WRITE);
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index ed239074cd4..55a0f23f8d0 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -199,7 +199,7 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 	kcam->bladesrotation = bladesrotation;
 
 	/* motion blur */
-	kcam->shuttertime= (need_motion == Scene::MOTION_BLUR)? shuttertime: 0.0f;
+	kcam->shuttertime = (need_motion == Scene::MOTION_BLUR) ? shuttertime: 0.0f;
 
 	/* type */
 	kcam->type = type;
diff --git a/intern/cycles/render/camera.h b/intern/cycles/render/camera.h
index 647423d88ba..d2a3cce1817 100644
--- a/intern/cycles/render/camera.h
+++ b/intern/cycles/render/camera.h
@@ -78,7 +78,7 @@ public:
 	bool use_motion;
 
 	/* computed camera parameters */
-    Transform screentoworld;
+	Transform screentoworld;
 	Transform rastertoworld;
 	Transform ndctoworld;
 	Transform rastertocamera;
diff --git a/intern/cycles/render/filter.cpp b/intern/cycles/render/filter.cpp
index 9bcf57b5a27..0bd4fb4d579 100644
--- a/intern/cycles/render/filter.cpp
+++ b/intern/cycles/render/filter.cpp
@@ -73,17 +73,17 @@ static vector<float> filter_table(FilterType type, float width)
 	/* compute cumulative distribution function */
 	filter_table_cdf[0] = 0.0f;
 	
-	for(i=0; i<filter_table_size; i++) {
+	for(i = 0; i < filter_table_size; i++) {
 		float x = i*width*0.5f/(filter_table_size-1);
 		float y = filter_func(x, width);
 		filter_table_cdf[i+1] += filter_table_cdf[i] + fabsf(y);
 	}
 
-	for(i=0; i<=filter_table_size; i++)
+	for(i = 0; i <= filter_table_size; i++)
 		filter_table_cdf[i] /= filter_table_cdf[filter_table_size];
 	
 	/* create importance sampling table */
-	for(i=0; i<=half_size; i++) {
+	for(i = 0; i <= half_size; i++) {
 		float x = i/(float)half_size;
 		int index = upper_bound(filter_table_cdf.begin(), filter_table_cdf.end(), x) - filter_table_cdf.begin();
 		float t;
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index eb9effc2658..efd814e4ae6 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -44,7 +44,7 @@ public:
 	float3 min, max;
 	bool use_minmax;
 
-	enum Mapping { NONE=0, X=1, Y=2, Z=3 };
+	enum Mapping { NONE = 0, X = 1, Y = 2, Z = 3 };
 	Mapping x_mapping, y_mapping, z_mapping;
 
 	enum Projection { FLAT, CUBE, TUBE, SPHERE };