diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 04:36:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 04:36:50 +0400 |
| commit | 857dedbc584fcf0af0afa13f008377fd9a83dad1 (patch) | |
| tree | 1a6d3fa834658422032f4de3140472b82a8cbfa6 /intern/cycles | |
| parent | 822362189badefd6c0014f608d36d98e8ab57282 (diff) | |
style cleanup
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_tex_coord.h | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_thread.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index db3592f1227..cfa4095104b 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -673,7 +673,7 @@ static void xml_read_mesh(const XMLReadState& state, pugi::xml_node node) for(int j = 0; j < nverts[i]-2; j++) { int v0 = verts[index_offset]; int v1 = verts[index_offset + j + 1]; - int v2 = verts[index_offset + j + 2];; + int v2 = verts[index_offset + j + 2]; sdmesh.add_face(v0, v1, v2); } diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 59eeb25ed74..68264f36bfb 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -417,7 +417,7 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Shader break; } case BL::ShaderNode::type_TEX_COORD: { - node = new TextureCoordinateNode();; + node = new TextureCoordinateNode(); break; } case BL::ShaderNode::type_TEX_SKY: { diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 937dbf2d87c..23ad5e5ff92 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -226,7 +226,7 @@ public: string kernel_path = path_get("kernel"); string md5 = path_files_md5_hash(kernel_path); - cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str());; + cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str()); cubin = path_user_get(path_join("cache", cubin)); /* if exists already, use it */ diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 09235506048..bb2b852d4e1 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -407,7 +407,7 @@ public: string device_md5 = device_md5_hash(); /* try to use cache binary */ - string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str());; + string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str()); clbin = path_user_get(path_join("cache", clbin)); if(path_exists(clbin)) { diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h index 9952557d614..854a708a988 100644 --- a/intern/cycles/kernel/svm/svm_tex_coord.h +++ b/intern/cycles/kernel/svm/svm_tex_coord.h @@ -43,7 +43,7 @@ __device_inline float3 svm_world_to_ndc(KernelGlobals *kg, ShaderData *sd, float else P = normalize(transform_direction(&tfm, P)); - float2 uv = direction_to_panorama(kg, P);; + float2 uv = direction_to_panorama(kg, P); return make_float3(uv.x, uv.y, 0.0f); } diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 3d15b342fe5..008f68e69e8 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -54,7 +54,7 @@ public: static void *run(void *arg) { - ((thread*)arg)->run_cb();; + ((thread*)arg)->run_cb(); return NULL; } |