From 16c05161e76621a1943f27abd6bd9f7ee5564efd Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Sun, 29 Apr 2018 09:27:44 +0200 Subject: Cycles: Cleanup: Remove double semicolons --- intern/cycles/kernel/kernel_types.h | 2 +- intern/cycles/kernel/svm/svm_bevel.h | 2 +- intern/cycles/kernel/svm/svm_displace.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/cycles/kernel') diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index af1ecb05788..72fbf7be557 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1452,7 +1452,7 @@ typedef struct KernelObject { uint attribute_map_offset; uint motion_offset; uint pad; -} KernelObject;; +} KernelObject; static_assert_align(KernelObject, 16); typedef struct KernelSpotLight { diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/svm_bevel.h index 6d5a10db98f..89f4a98e846 100644 --- a/intern/cycles/kernel/svm/svm_bevel.h +++ b/intern/cycles/kernel/svm/svm_bevel.h @@ -216,7 +216,7 @@ ccl_device void svm_node_bevel( if(stack_valid(normal_offset)) { /* Preserve input normal. */ float3 ref_N = stack_load_float3(stack, normal_offset); - bevel_N = normalize(ref_N + (bevel_N - sd->N));; + bevel_N = normalize(ref_N + (bevel_N - sd->N)); } stack_store_float3(stack, out_offset, bevel_N); diff --git a/intern/cycles/kernel/svm/svm_displace.h b/intern/cycles/kernel/svm/svm_displace.h index b9fd5bbf84d..533b7f065e6 100644 --- a/intern/cycles/kernel/svm/svm_displace.h +++ b/intern/cycles/kernel/svm/svm_displace.h @@ -141,7 +141,7 @@ ccl_device void svm_node_vector_displacement(KernelGlobals *kg, ShaderData *sd, tangent = normalize(sd->dPdu); } - float3 bitangent = normalize(cross(normal, tangent));; + float3 bitangent = normalize(cross(normal, tangent)); const AttributeDescriptor attr_sign = find_attribute(kg, sd, node.w); if(attr_sign.offset != ATTR_STD_NOT_FOUND) { float sign = primitive_attribute_float(kg, sd, attr_sign, NULL, NULL); -- cgit v1.2.3