[Bf-blender-cvs] [84e8b05] master: Cycles: Minor code style cleanup

Sergey Sharybin noreply at git.blender.org
Sun Nov 1 11:40:57 CET 2015


Commit: 84e8b05e97522b9c12bd389c931601814307e5ff
Author: Sergey Sharybin
Date:   Sun Nov 1 15:39:58 2015 +0500
Branches: master
https://developer.blender.org/rB84e8b05e97522b9c12bd389c931601814307e5ff

Cycles: Minor code style cleanup

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

M	intern/cycles/device/device_opencl.cpp
M	intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
M	intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index a9e5f02..d6b1ab3 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1115,7 +1115,7 @@ public:
 	{
 		/* this is blocking */
 		size_t size = mem.memory_size();
-		if(size != 0){
+		if(size != 0) {
 			opencl_assert(clEnqueueWriteBuffer(cqCommandQueue,
 			                                   CL_MEM_PTR(mem.device_pointer),
 			                                   CL_TRUE,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
index 2f099d8..feee4b7 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
@@ -61,7 +61,7 @@ __kernel void kernel_ocl_path_trace_lamp_emission(
 			return;
 		}
 	} else {
-		if(x < (sw * parallel_samples) && y < sh){
+		if(x < (sw * parallel_samples) && y < sh) {
 			ray_index = x + y * (sw * parallel_samples);
 		} else {
 			return;
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
index 3750a0d..c9bbd65 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl
@@ -58,7 +58,7 @@ __kernel void kernel_ocl_path_trace_scene_intersect(
 			return;
 		}
 	} else {
-		if(x < (sw * parallel_samples) && y < sh){
+		if(x < (sw * parallel_samples) && y < sh) {
 			ray_index = x + y * (sw * parallel_samples);
 		} else {
 			return;




More information about the Bf-blender-cvs mailing list