diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-30 20:30:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 20:30:54 +0200 |
| commit | 6fed21c7cb85c4dd5842d8cb9fc268957a0429fd (patch) | |
| tree | d2a2f6b20cc8d42663f0529aae132069a9b88714 /modules/csg | |
| parent | 8f47ca8fe4c16d5190572389ec6041efeae46726 (diff) | |
| parent | 72ea74bcc15e4a53f74e217ece0eea6d7aed04ad (diff) | |
Merge pull request #37356 from akien-mga/scons-enable-werror
SCons: Treat all warnings as errors
Diffstat (limited to 'modules/csg')
| -rw-r--r-- | modules/csg/csg_shape.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 848b865efb..1ed48a573c 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -742,18 +742,14 @@ CSGBrush *CSGMesh3D::_build_brush() { Vector<Vector3> anormals = arrays[Mesh::ARRAY_NORMAL]; const Vector3 *nr = NULL; - bool nr_used = false; if (anormals.size()) { nr = anormals.ptr(); - nr_used = true; } Vector<Vector2> auvs = arrays[Mesh::ARRAY_TEX_UV]; const Vector2 *uvr = NULL; - bool uvr_used = false; if (auvs.size()) { uvr = auvs.ptr(); - uvr_used = true; } Ref<Material> mat; @@ -789,10 +785,10 @@ CSGBrush *CSGMesh3D::_build_brush() { for (int k = 0; k < 3; k++) { int idx = ir[j + k]; vertex[k] = vr[idx]; - if (nr_used) { + if (nr) { normal[k] = nr[idx]; } - if (uvr_used) { + if (uvr) { uv[k] = uvr[idx]; } } @@ -832,10 +828,10 @@ CSGBrush *CSGMesh3D::_build_brush() { for (int k = 0; k < 3; k++) { vertex[k] = vr[j + k]; - if (nr_used) { + if (nr) { normal[k] = nr[j + k]; } - if (uvr_used) { + if (uvr) { uv[k] = uvr[j + k]; } } |