Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Code cleanup, spaces around keyword and brace

Browse Source
This commit is contained in:
Sergey Sharybin
2015-06-01 18:11:57 +05:00
parent f45f2ac687
commit 399a27b261
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_shader.cpp
View File

@@ -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,

6
intern/cycles/device/device.cpp
View File

@@ -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);
}

4
intern/cycles/device/device_cuda.cpp
View File

@@ -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;

6
intern/cycles/util/util_atomic.h
View File

@@ -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__ */