Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-11-01 13:39:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-11-01 13:40:17 +0300
commit84e8b05e97522b9c12bd389c931601814307e5ff (patch)
tree149bb1626f5ea895943b8886407b1e28f309e7eb
parent99df433ea76c5b4b0009944e902ef7bd4166a17f (diff)
Cycles: Minor code style cleanup
-rw-r--r--intern/cycles/device/device_opencl.cpp2
-rw-r--r--intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl2
-rw-r--r--intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl2
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index a9e5f021a57..d6b1ab38bd0 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 2f099d86970..feee4b7a01e 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 3750a0d0062..c9bbd65c706 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;