diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-24 15:36:18 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-24 15:36:18 +0300 |
commit | 658a9c6cf5228efafd9e7b8d5282f09019f4c4f2 (patch) | |
tree | 05815144ef68abe6d983bd9c8d282406cea074e8 /intern/cycles/kernel/svm | |
parent | e92e90c30e148bf216fbf9829cdc4a7058cfd6f8 (diff) |
Cycles: Cleanup, style
I wouldn't mind changing style to have space after keyword, but there was
no official code style change proposed.
Diffstat (limited to 'intern/cycles/kernel/svm')
-rw-r--r-- | intern/cycles/kernel/svm/svm_ao.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_bevel.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_closure.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_math_util.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_voronoi.h | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/intern/cycles/kernel/svm/svm_ao.h b/intern/cycles/kernel/svm/svm_ao.h index d2d36cefd50..0337c88a543 100644 --- a/intern/cycles/kernel/svm/svm_ao.h +++ b/intern/cycles/kernel/svm/svm_ao.h @@ -98,11 +98,11 @@ ccl_device void svm_node_ao(KernelGlobals *kg, float3 normal = stack_valid(normal_offset)? stack_load_float3(stack, normal_offset): sd->N; float ao = svm_ao(kg, sd, normal, state, dist, samples, flags); - if (stack_valid(out_ao_offset)) { + if(stack_valid(out_ao_offset)) { stack_store_float(stack, out_ao_offset, ao); } - if (stack_valid(out_color_offset)) { + if(stack_valid(out_color_offset)) { float3 color = stack_load_float3(stack, color_offset); stack_store_float3(stack, out_color_offset, ao * color); } diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/svm_bevel.h index 19cdb71c20f..79d0fb6ddbe 100644 --- a/intern/cycles/kernel/svm/svm_bevel.h +++ b/intern/cycles/kernel/svm/svm_bevel.h @@ -148,11 +148,11 @@ ccl_device_noinline float3 svm_bevel( int prim = kernel_tex_fetch(__prim_index, isect.hits[hit].prim); int shader = kernel_tex_fetch(__tri_shader, prim); - if (shader & SHADER_SMOOTH_NORMAL) { + if(shader & SHADER_SMOOTH_NORMAL) { float u = isect.hits[hit].u; float v = isect.hits[hit].v; - if (sd->type & PRIMITIVE_TRIANGLE) { + if(sd->type & PRIMITIVE_TRIANGLE) { N = triangle_smooth_normal(kg, N, prim, u, v); } #ifdef __OBJECT_MOTION__ diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index aa253223c93..cce0e0eefe0 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -757,7 +757,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float * const AttributeDescriptor attr_descr_random = find_attribute(kg, sd, data_node4.y); float random = 0.0f; - if (attr_descr_random.offset != ATTR_STD_NOT_FOUND) { + if(attr_descr_random.offset != ATTR_STD_NOT_FOUND) { random = primitive_attribute_float(kg, sd, attr_descr_random, NULL, NULL); } else { @@ -769,7 +769,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float * if(bsdf) { PrincipledHairExtra *extra = (PrincipledHairExtra*)closure_alloc_extra(sd, sizeof(PrincipledHairExtra)); - if (!extra) + if(!extra) break; /* Random factors range: [-randomization/2, +randomization/2]. */ diff --git a/intern/cycles/kernel/svm/svm_math_util.h b/intern/cycles/kernel/svm/svm_math_util.h index d3490ab284f..669b174e4a3 100644 --- a/intern/cycles/kernel/svm/svm_math_util.h +++ b/intern/cycles/kernel/svm/svm_math_util.h @@ -94,13 +94,13 @@ ccl_device float svm_math(NodeMath type, float Fac1, float Fac2) Fac = fabsf(Fac1); else if(type == NODE_MATH_ARCTAN2) Fac = atan2f(Fac1, Fac2); - else if (type == NODE_MATH_FLOOR) + else if(type == NODE_MATH_FLOOR) Fac = floorf(Fac1); - else if (type == NODE_MATH_CEIL) + else if(type == NODE_MATH_CEIL) Fac = ceilf(Fac1); - else if (type == NODE_MATH_FRACT) + else if(type == NODE_MATH_FRACT) Fac = Fac1 - floorf(Fac1); - else if (type == NODE_MATH_SQRT) + else if(type == NODE_MATH_SQRT) Fac = safe_sqrtf(Fac1); else if(type == NODE_MATH_CLAMP) Fac = saturate(Fac1); diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/svm_voronoi.h index 4e66e87611f..d661df54ead 100644 --- a/intern/cycles/kernel/svm/svm_voronoi.h +++ b/intern/cycles/kernel/svm/svm_voronoi.h @@ -70,7 +70,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance, } /* To keep the shortest four distances and associated points we have to keep them in sorted order. */ - if (d < da[0]) { + if(d < da[0]) { da[3] = da[2]; da[2] = da[1]; da[1] = da[0]; @@ -81,7 +81,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance, pa[1] = pa[0]; pa[0] = vp; } - else if (d < da[1]) { + else if(d < da[1]) { da[3] = da[2]; da[2] = da[1]; da[1] = d; @@ -90,14 +90,14 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance, pa[2] = pa[1]; pa[1] = vp; } - else if (d < da[2]) { + else if(d < da[2]) { da[3] = da[2]; da[2] = d; pa[3] = pa[2]; pa[2] = vp; } - else if (d < da[3]) { + else if(d < da[3]) { da[3] = d; pa[3] = vp; } |