gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 02:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37354 from marxin/fix-maybe-uninitialized-warnings

Browse source 
Fix various -Wmaybe-uninitialized (#37352).
This commit is contained in:
Rémi Verschelde 2020-03-27 14:32:22 +01:00 committed by GitHub
parent 64470ef639 c554677c95
commit 7750302944
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/csg/csg_shape.cpp
View file

@ -741,7 +741,7 @@ CSGBrush *CSGMesh::_build_brush() {
const Vector3 *vr = avertices.ptr(); const Vector3 *vr = avertices.ptr();
Vector<Vector3> anormals = arrays[Mesh::ARRAY_NORMAL]; Vector<Vector3> anormals = arrays[Mesh::ARRAY_NORMAL];
const Vector3 *nr; const Vector3 *nr = NULL;
bool nr_used = false; bool nr_used = false;
if (anormals.size()) { if (anormals.size()) {
nr = anormals.ptr(); nr = anormals.ptr();
@ -749,7 +749,7 @@ CSGBrush *CSGMesh::_build_brush() {
} }
Vector<Vector2> auvs = arrays[Mesh::ARRAY_TEX_UV]; Vector<Vector2> auvs = arrays[Mesh::ARRAY_TEX_UV];
const Vector2 *uvr; const Vector2 *uvr = NULL;
bool uvr_used = false; bool uvr_used = false;
if (auvs.size()) { if (auvs.size()) {
uvr = auvs.ptr(); uvr = auvs.ptr();

2
scene/resources/mesh.cpp
View file

@ -372,7 +372,7 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
ERR_FAIL_COND_V(arrays.size() != ARRAY_MAX, Ref<ArrayMesh>()); ERR_FAIL_COND_V(arrays.size() != ARRAY_MAX, Ref<ArrayMesh>());
{ {
int *ir; int *ir = NULL;
Vector<int> indices = arrays[ARRAY_INDEX]; Vector<int> indices = arrays[ARRAY_INDEX];
bool has_indices = false; bool has_indices = false;
Vector<Vector3> vertices = arrays[ARRAY_VERTEX]; Vector<Vector3> vertices = arrays[ARRAY_VERTEX];

28
scene/resources/mesh_data_tool.cpp
View file

@ -58,30 +58,30 @@ Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surf
const Vector3 *vr = varray.ptr(); const Vector3 *vr = varray.ptr();
const Vector3 *nr; const Vector3 *nr = NULL;
if (arrays[Mesh::ARRAY_NORMAL].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_NORMAL].get_type() != Variant::NIL)
nr = arrays[Mesh::ARRAY_NORMAL].operator Vector<Vector3>().ptr(); nr = arrays[Mesh::ARRAY_NORMAL].operator Vector<Vector3>().ptr();
const real_t *ta; const real_t *ta = NULL;
if (arrays[Mesh::ARRAY_TANGENT].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_TANGENT].get_type() != Variant::NIL)
ta = arrays[Mesh::ARRAY_TANGENT].operator Vector<real_t>().ptr(); ta = arrays[Mesh::ARRAY_TANGENT].operator Vector<real_t>().ptr();
const Vector2 *uv; const Vector2 *uv = NULL;
if (arrays[Mesh::ARRAY_TEX_UV].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_TEX_UV].get_type() != Variant::NIL)
uv = arrays[Mesh::ARRAY_TEX_UV].operator Vector<Vector2>().ptr(); uv = arrays[Mesh::ARRAY_TEX_UV].operator Vector<Vector2>().ptr();
const Vector2 *uv2; const Vector2 *uv2 = NULL;
if (arrays[Mesh::ARRAY_TEX_UV2].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_TEX_UV2].get_type() != Variant::NIL)
uv2 = arrays[Mesh::ARRAY_TEX_UV2].operator Vector<Vector2>().ptr(); uv2 = arrays[Mesh::ARRAY_TEX_UV2].operator Vector<Vector2>().ptr();
const Color *col; const Color *col = NULL;
if (arrays[Mesh::ARRAY_COLOR].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_COLOR].get_type() != Variant::NIL)
col = arrays[Mesh::ARRAY_COLOR].operator Vector<Color>().ptr(); col = arrays[Mesh::ARRAY_COLOR].operator Vector<Color>().ptr();
const int *bo; const int *bo = NULL;
if (arrays[Mesh::ARRAY_BONES].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_BONES].get_type() != Variant::NIL)
bo = arrays[Mesh::ARRAY_BONES].operator Vector<int>().ptr(); bo = arrays[Mesh::ARRAY_BONES].operator Vector<int>().ptr();
const real_t *we; const real_t *we = NULL;
if (arrays[Mesh::ARRAY_WEIGHTS].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_WEIGHTS].get_type() != Variant::NIL)
we = arrays[Mesh::ARRAY_WEIGHTS].operator Vector<real_t>().ptr(); we = arrays[Mesh::ARRAY_WEIGHTS].operator Vector<real_t>().ptr();
@ -202,43 +202,43 @@ Error MeshDataTool::commit_to_surface(const Ref<ArrayMesh> &p_mesh) {
v.resize(vcount); v.resize(vcount);
Vector3 *vr = v.ptrw(); Vector3 *vr = v.ptrw();
Vector3 *nr; Vector3 *nr = NULL;
if (format & Mesh::ARRAY_FORMAT_NORMAL) { if (format & Mesh::ARRAY_FORMAT_NORMAL) {
n.resize(vcount); n.resize(vcount);
nr = n.ptrw(); nr = n.ptrw();
} }
real_t *ta; real_t *ta = NULL;
if (format & Mesh::ARRAY_FORMAT_TANGENT) { if (format & Mesh::ARRAY_FORMAT_TANGENT) {
t.resize(vcount * 4); t.resize(vcount * 4);
ta = t.ptrw(); ta = t.ptrw();
} }
Vector2 *uv; Vector2 *uv = NULL;
if (format & Mesh::ARRAY_FORMAT_TEX_UV) { if (format & Mesh::ARRAY_FORMAT_TEX_UV) {
u.resize(vcount); u.resize(vcount);
uv = u.ptrw(); uv = u.ptrw();
} }
Vector2 *uv2; Vector2 *uv2 = NULL;
if (format & Mesh::ARRAY_FORMAT_TEX_UV2) { if (format & Mesh::ARRAY_FORMAT_TEX_UV2) {
u2.resize(vcount); u2.resize(vcount);
uv2 = u2.ptrw(); uv2 = u2.ptrw();
} }
Color *col; Color *col = NULL;
if (format & Mesh::ARRAY_FORMAT_COLOR) { if (format & Mesh::ARRAY_FORMAT_COLOR) {
c.resize(vcount); c.resize(vcount);
col = c.ptrw(); col = c.ptrw();
} }
int *bo; int *bo = NULL;
if (format & Mesh::ARRAY_FORMAT_BONES) { if (format & Mesh::ARRAY_FORMAT_BONES) {
b.resize(vcount * 4); b.resize(vcount * 4);
bo = b.ptrw(); bo = b.ptrw();
} }
real_t *we; real_t *we = NULL;
if (format & Mesh::ARRAY_FORMAT_WEIGHTS) { if (format & Mesh::ARRAY_FORMAT_WEIGHTS) {
w.resize(vcount * 4); w.resize(vcount * 4);
we = w.ptrw(); we = w.ptrw();

4
servers/visual/rasterizer_rd/rasterizer_scene_high_end_rd.cpp
View file

@ -809,7 +809,7 @@ void RasterizerSceneHighEndRD::_render_list(RenderingDevice::DrawListID p_draw_l
} }
} }
ShaderVersion shader_version; ShaderVersion shader_version = SHADER_VERSION_MAX;
switch (p_pass_mode) { switch (p_pass_mode) {
case PASS_MODE_COLOR: case PASS_MODE_COLOR:
@ -855,7 +855,7 @@ void RasterizerSceneHighEndRD::_render_list(RenderingDevice::DrawListID p_draw_l
pipeline = &shader->pipelines[cull_variant][primitive][shader_version]; pipeline = &shader->pipelines[cull_variant][primitive][shader_version];
RD::VertexFormatID vertex_format; RD::VertexFormatID vertex_format = -1;
RID vertex_array_rd; RID vertex_array_rd;
RID index_array_rd; RID index_array_rd;

2
servers/visual_server.cpp
View file

@ -333,7 +333,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_
uint8_t *vw = r_vertex_array.ptrw(); uint8_t *vw = r_vertex_array.ptrw();
uint8_t *iw; uint8_t *iw = NULL;
if (r_index_array.size()) { if (r_index_array.size()) {
iw = r_index_array.ptrw(); iw = r_index_array.ptrw();
} }