[Bf-blender-cvs] [399a27b] master: Cycles: Code cleanup, spaces around keyword and brace

[Sergey Sharybin]

Commit: 399a27b2616bcf7dc50de7a27e513c8db6296329
Author: Sergey Sharybin
Date:   Mon Jun 1 18:11:57 2015 +0500
Branches: master
https://developer.blender.org/rB399a27b2616bcf7dc50de7a27e513c8db6296329

Cycles: Code cleanup, spaces around keyword and brace

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

M	intern/cycles/blender/blender_shader.cpp
M	intern/cycles/device/device.cpp
M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/util/util_atomic.h

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

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index d3b01fb..2b0e8ac 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -897,7 +897,7 @@ static void add_nodes(Scene *scene,
 				output_map[b_output->ptr.data] = proxy->outputs[0];
 			}
 			
-			if (b_group_ntree) {
+			if(b_group_ntree) {
 				add_nodes(scene,
 				          b_engine,
 				          b_data,
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index d69244a..0a4802c 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -94,7 +94,7 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dx, int d
 		}
 
 		if(GLEW_VERSION_1_5) {
-			if (!vertex_buffer)
+			if(!vertex_buffer)
 				glGenBuffers(1, &vertex_buffer);
 
 			glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
@@ -110,7 +110,7 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dx, int d
 			vp = vbuffer;
 		}
 
-		if (vp) {
+		if(vp) {
 			/* texture coordinate - vertex pair */
 			vp[0] = 0.0f;
 			vp[1] = 0.0f;
@@ -132,7 +132,7 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dx, int d
 			vp[14] = dx;
 			vp[15] = (float)height + dy;
 
-			if (vertex_buffer)
+			if(vertex_buffer)
 				glUnmapBuffer(GL_ARRAY_BUFFER);
 		}
 
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 8d69046..80a2dda 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -919,7 +919,7 @@ public:
 				draw_params.bind_display_space_shader_cb();
 			}
 
-			if (!vertex_buffer)
+			if(!vertex_buffer)
 				glGenBuffers(1, &vertex_buffer);
 
 			glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
@@ -928,7 +928,7 @@ public:
 
 			vpointer = (float *)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY);
 
-			if (vpointer) {
+			if(vpointer) {
 				/* texture coordinate - vertex pair */
 				vpointer[0] = 0.0f;
 				vpointer[1] = 0.0f;
diff --git a/intern/cycles/util/util_atomic.h b/intern/cycles/util/util_atomic.h
index 85a82d3..1d1e296 100644
--- a/intern/cycles/util/util_atomic.h
+++ b/intern/cycles/util/util_atomic.h
@@ -53,9 +53,9 @@ ccl_device_inline void atomic_add_float(volatile ccl_global float *source,
 	do {
 		prev_value.float_value = *source;
 		new_value.float_value = prev_value.float_value + operand;
-	} while (atomic_cmpxchg((volatile ccl_global unsigned int *)source,
-	                        prev_value.int_value,
-	                        new_value.int_value) != prev_value.int_value);
+	} while(atomic_cmpxchg((volatile ccl_global unsigned int *)source,
+	                       prev_value.int_value,
+	                       new_value.int_value) != prev_value.int_value);
 }
 
 #endif  /* __KERNEL_OPENCL__ */