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

Cycles: Cleanup: Remove double semicolons

Browse Source
This commit is contained in:
Lukas Stockner
2018-04-29 09:27:44 +02:00
parent 60f4cb24da
commit 16c05161e7
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1684,7 +1684,7 @@ public:
min_blocks *= 8; 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. */ /* Render all samples. */
int start_sample = rtile.start_sample; int start_sample = rtile.start_sample;

2
intern/cycles/kernel/kernel_types.h
View File

@@ -1452,7 +1452,7 @@ typedef struct KernelObject {
uint attribute_map_offset; uint attribute_map_offset;
uint motion_offset; uint motion_offset;
uint pad; uint pad;
} KernelObject;; } KernelObject;
static_assert_align(KernelObject, 16); static_assert_align(KernelObject, 16);
typedef struct KernelSpotLight { typedef struct KernelSpotLight {

2
intern/cycles/kernel/svm/svm_bevel.h
View File

@@ -216,7 +216,7 @@ ccl_device void svm_node_bevel(
if(stack_valid(normal_offset)) { if(stack_valid(normal_offset)) {
/* Preserve input normal. */ /* Preserve input normal. */
float3 ref_N = stack_load_float3(stack, normal_offset); 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); stack_store_float3(stack, out_offset, bevel_N);

2
intern/cycles/kernel/svm/svm_displace.h
View File

@@ -141,7 +141,7 @@ ccl_device void svm_node_vector_displacement(KernelGlobals *kg, ShaderData *sd,
tangent = normalize(sd->dPdu); 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); const AttributeDescriptor attr_sign = find_attribute(kg, sd, node.w);
if(attr_sign.offset != ATTR_STD_NOT_FOUND) { if(attr_sign.offset != ATTR_STD_NOT_FOUND) {
float sign = primitive_attribute_float(kg, sd, attr_sign, NULL, NULL); float sign = primitive_attribute_float(kg, sd, attr_sign, NULL, NULL);

2
intern/cycles/render/nodes.cpp
View File

@@ -4601,7 +4601,7 @@ void AttributeNode::compile(SVMCompiler& compiler)
ShaderOutput *vector_out = output("Vector"); ShaderOutput *vector_out = output("Vector");
ShaderOutput *fac_out = output("Fac"); ShaderOutput *fac_out = output("Fac");
ShaderNodeType attr_node = NODE_ATTR; ShaderNodeType attr_node = NODE_ATTR;
int attr = compiler.attribute_standard(attribute);; int attr = compiler.attribute_standard(attribute);
if(bump == SHADER_BUMP_DX) if(bump == SHADER_BUMP_DX)
attr_node = NODE_ATTR_BUMP_DX; attr_node = NODE_ATTR_BUMP_DX;

2
intern/cycles/render/object.cpp
View File

@@ -480,7 +480,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s
kobject.dupli_uv[1] = ob->dupli_uv[1]; kobject.dupli_uv[1] = ob->dupli_uv[1];
int totalsteps = mesh->motion_steps; int totalsteps = mesh->motion_steps;
kobject.numsteps = (totalsteps - 1)/2; kobject.numsteps = (totalsteps - 1)/2;
kobject.numverts = mesh->verts.size();; kobject.numverts = mesh->verts.size();
kobject.patch_map_offset = 0; kobject.patch_map_offset = 0;
kobject.attribute_map_offset = 0; kobject.attribute_map_offset = 0;

2
intern/cycles/util/util_math_float3.h
View File

@@ -67,7 +67,7 @@ ccl_device_inline float len_squared(const float3 a);
ccl_device_inline float3 saturate3(float3 a); ccl_device_inline float3 saturate3(float3 a);
ccl_device_inline float3 safe_normalize(const 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 safe_normalize_len(const float3 a, float *t);
ccl_device_inline float3 interp(float3 a, float3 b, float t); ccl_device_inline float3 interp(float3 a, float3 b, float t);