diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-05-14 07:39:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-14 07:39:54 +0200 |
commit | dd2aba021cade88b6b029071edde634197a253cd (patch) | |
tree | 866aa827dd2b25339a670efa8c5408bef6138577 /scene/resources | |
parent | e036eb648b2437ef9a5a074df534a487465996b0 (diff) | |
parent | 7f72d6476b7bf5a248685e91a994ac4d73e50ff6 (diff) |
Merge pull request #18853 from YeldhamDev/gui_cppcheck_fixes
Fixed some warnings found with Cppcheck
Diffstat (limited to 'scene/resources')
-rw-r--r-- | scene/resources/mesh.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index d87644381c..b0620d3363 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -222,7 +222,6 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const { continue; Array a = surface_get_arrays(i); - int vcount = 0; if (i == 0) { arrays = a; @@ -230,6 +229,7 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const { index_accum += v.size(); } else { + int vcount = 0; for (int j = 0; j < arrays.size(); j++) { if (arrays[j].get_type() == Variant::NIL || a[j].get_type() == Variant::NIL) { @@ -1194,8 +1194,6 @@ Error ArrayMesh::lightmap_unwrap(const Transform &p_base_transform, float p_texe for (int j = 0; j < 3; j++) { - int vertex_idx = gen_vertices[gen_indices[i + j]]; - SurfaceTool::Vertex v = surfaces[surface].vertices[uv_index[gen_vertices[gen_indices[i + j]]].second]; if (surfaces[surface].format & ARRAY_FORMAT_COLOR) { |