diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-01 16:11:57 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-01 17:49:52 +0300 |
| commit | 399a27b2616bcf7dc50de7a27e513c8db6296329 (patch) | |
| tree | 2e02e1d2f1827dc1369c1f542286d9d51114fa8a /intern | |
| parent | f45f2ac68732aae68cb13103795ba9303fa5da77 (diff) | |
Cycles: Code cleanup, spaces around keyword and brace
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device.cpp | 6 | ||||
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/util/util_atomic.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index d3b01fbf1d4..2b0e8acae38 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 d69244a07bd..0a4802c2c90 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 8d690466c07..80a2dda22c4 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 85a82d38275..1d1e2963348 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__ */ |