diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_bevel.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_displace.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/render/object.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_math_float3.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 66c3f526ae7..b1bc417ba4f 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1684,7 +1684,7 @@ public: min_blocks *= 8; } - uint step_samples = divide_up(min_blocks * num_threads_per_block, wtile->w * wtile->h);; + uint step_samples = divide_up(min_blocks * num_threads_per_block, wtile->w * wtile->h); /* Render all samples. */ int start_sample = rtile.start_sample; 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); diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index d732189af66..01399c85bc0 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -4601,7 +4601,7 @@ void AttributeNode::compile(SVMCompiler& compiler) ShaderOutput *vector_out = output("Vector"); ShaderOutput *fac_out = output("Fac"); ShaderNodeType attr_node = NODE_ATTR; - int attr = compiler.attribute_standard(attribute);; + int attr = compiler.attribute_standard(attribute); if(bump == SHADER_BUMP_DX) attr_node = NODE_ATTR_BUMP_DX; diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 138de250c5f..4d64d841206 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -480,7 +480,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s kobject.dupli_uv[1] = ob->dupli_uv[1]; int totalsteps = mesh->motion_steps; kobject.numsteps = (totalsteps - 1)/2; - kobject.numverts = mesh->verts.size();; + kobject.numverts = mesh->verts.size(); kobject.patch_map_offset = 0; kobject.attribute_map_offset = 0; diff --git a/intern/cycles/util/util_math_float3.h b/intern/cycles/util/util_math_float3.h index a0a62ae95df..f5149fe13ed 100644 --- a/intern/cycles/util/util_math_float3.h +++ b/intern/cycles/util/util_math_float3.h @@ -67,7 +67,7 @@ ccl_device_inline float len_squared(const float3 a); ccl_device_inline float3 saturate3(float3 a); ccl_device_inline float3 safe_normalize(const float3 a); -ccl_device_inline float3 normalize_len(const float3 a, float *t);; +ccl_device_inline float3 normalize_len(const float3 a, float *t); ccl_device_inline float3 safe_normalize_len(const float3 a, float *t); ccl_device_inline float3 interp(float3 a, float3 b, float t); |