diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-18 21:14:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 21:14:28 +0100 |
| commit | b967c910b88ed0cf134749464dcec7f4311e19f4 (patch) | |
| tree | dcf63119d2b917452f8c2b6ce01787eeee02273a /scene/resources | |
| parent | 7d691c1812a42d8aafafc2733d59723aa622f44b (diff) | |
| parent | 49fec646cbf3afdf5e7d55589ab359a5ebcdb897 (diff) | |
Merge pull request #36327 from akien-mga/fix-warnings-reenable-werror
Fix compilation warnings and re-enable werror=yes on Travis
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/surface_tool.cpp | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index fc5c906bd4..fa177d03fb 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -537,58 +537,36 @@ Vector<SurfaceTool::Vertex> SurfaceTool::create_vertex_array_from_triangle_array Vector<float> warr = p_arrays[VS::ARRAY_WEIGHTS]; int vc = varr.size(); - if (vc == 0) return ret; - int lformat = 0; - const Vector3 *rv; + int lformat = 0; if (varr.size()) { lformat |= VS::ARRAY_FORMAT_VERTEX; - rv = varr.ptr(); } - const Vector3 *rn; if (narr.size()) { lformat |= VS::ARRAY_FORMAT_NORMAL; - rn = narr.ptr(); } - const float *rt; if (tarr.size()) { lformat |= VS::ARRAY_FORMAT_TANGENT; - rt = tarr.ptr(); } - const Color *rc; if (carr.size()) { lformat |= VS::ARRAY_FORMAT_COLOR; - rc = carr.ptr(); } - - const Vector2 *ruv; if (uvarr.size()) { lformat |= VS::ARRAY_FORMAT_TEX_UV; - ruv = uvarr.ptr(); } - - const Vector2 *ruv2; if (uv2arr.size()) { lformat |= VS::ARRAY_FORMAT_TEX_UV2; - ruv2 = uv2arr.ptr(); } - - const int *rb; if (barr.size()) { lformat |= VS::ARRAY_FORMAT_BONES; - rb = barr.ptr(); } - - const float *rw; if (warr.size()) { lformat |= VS::ARRAY_FORMAT_WEIGHTS; - rw = warr.ptr(); } for (int i = 0; i < vc; i++) { - Vertex v; if (lformat & VS::ARRAY_FORMAT_VERTEX) v.vertex = varr[i]; @@ -642,58 +620,36 @@ void SurfaceTool::_create_list_from_arrays(Array arr, List<Vertex> *r_vertex, Li Vector<float> warr = arr[VS::ARRAY_WEIGHTS]; int vc = varr.size(); - if (vc == 0) return; - lformat = 0; - const Vector3 *rv; + lformat = 0; if (varr.size()) { lformat |= VS::ARRAY_FORMAT_VERTEX; - rv = varr.ptr(); } - const Vector3 *rn; if (narr.size()) { lformat |= VS::ARRAY_FORMAT_NORMAL; - rn = narr.ptr(); } - const float *rt; if (tarr.size()) { lformat |= VS::ARRAY_FORMAT_TANGENT; - rt = tarr.ptr(); } - const Color *rc; if (carr.size()) { lformat |= VS::ARRAY_FORMAT_COLOR; - rc = carr.ptr(); } - - const Vector2 *ruv; if (uvarr.size()) { lformat |= VS::ARRAY_FORMAT_TEX_UV; - ruv = uvarr.ptr(); } - - const Vector2 *ruv2; if (uv2arr.size()) { lformat |= VS::ARRAY_FORMAT_TEX_UV2; - ruv2 = uv2arr.ptr(); } - - const int *rb; if (barr.size()) { lformat |= VS::ARRAY_FORMAT_BONES; - rb = barr.ptr(); } - - const float *rw; if (warr.size()) { lformat |= VS::ARRAY_FORMAT_WEIGHTS; - rw = warr.ptr(); } for (int i = 0; i < vc; i++) { - Vertex v; if (lformat & VS::ARRAY_FORMAT_VERTEX) v.vertex = varr[i]; |