maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #38060 from akien-mga/fix-gcc-Wmaybe-uninitialized

Browse source 
Fix more GCC -Wmaybe-uninitialized warnings
This commit is contained in:
Rémi Verschelde 2020-04-20 23:47:53 +02:00 committed by GitHub
parent b4855f5c83 94f0c62789
commit 58a8ca5298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/3d/voxelizer.cpp
View file

@ -592,22 +592,16 @@ void Voxelizer::plot_mesh(const Transform &p_xform, Ref<Mesh> &p_mesh, const Vec
Vector<Vector3> vertices = a[Mesh::ARRAY_VERTEX]; Vector<Vector3> vertices = a[Mesh::ARRAY_VERTEX];
const Vector3 *vr = vertices.ptr(); const Vector3 *vr = vertices.ptr();
Vector<Vector2> uv = a[Mesh::ARRAY_TEX_UV]; Vector<Vector2> uv = a[Mesh::ARRAY_TEX_UV];
const Vector2 *uvr; const Vector2 *uvr = nullptr;
Vector<Vector3> normals = a[Mesh::ARRAY_NORMAL]; Vector<Vector3> normals = a[Mesh::ARRAY_NORMAL];
const Vector3 *nr; const Vector3 *nr = nullptr;
Vector<int> index = a[Mesh::ARRAY_INDEX]; Vector<int> index = a[Mesh::ARRAY_INDEX];
bool read_uv = false;
bool read_normals = false;
if (uv.size()) { if (uv.size()) {
uvr = uv.ptr(); uvr = uv.ptr();
read_uv = true;
} }
if (normals.size()) { if (normals.size()) {
read_normals = true;
nr = normals.ptr(); nr = normals.ptr();
} }
@ -626,13 +620,13 @@ void Voxelizer::plot_mesh(const Transform &p_xform, Ref<Mesh> &p_mesh, const Vec
vtxs[k] = p_xform.xform(vr[ir[j * 3 + k]]); vtxs[k] = p_xform.xform(vr[ir[j * 3 + k]]);
} }
if (read_uv) { if (uvr) {
for (int k = 0; k < 3; k++) { for (int k = 0; k < 3; k++) {
uvs[k] = uvr[ir[j * 3 + k]]; uvs[k] = uvr[ir[j * 3 + k]];
} }
} }
if (read_normals) { if (nr) {
for (int k = 0; k < 3; k++) { for (int k = 0; k < 3; k++) {
normal[k] = nr[ir[j * 3 + k]]; normal[k] = nr[ir[j * 3 + k]];
} }
@ -659,13 +653,13 @@ void Voxelizer::plot_mesh(const Transform &p_xform, Ref<Mesh> &p_mesh, const Vec
vtxs[k] = p_xform.xform(vr[j * 3 + k]); vtxs[k] = p_xform.xform(vr[j * 3 + k]);
} }
if (read_uv) { if (uvr) {
for (int k = 0; k < 3; k++) { for (int k = 0; k < 3; k++) {
uvs[k] = uvr[j * 3 + k]; uvs[k] = uvr[j * 3 + k];
} }
} }
if (read_normals) { if (nr) {
for (int k = 0; k < 3; k++) { for (int k = 0; k < 3; k++) {
normal[k] = nr[j * 3 + k]; normal[k] = nr[j * 3 + k];
} }