asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25888 from marxin/fix-25217-part-2

Browse source 
Fix 2 more UBSAN issues (#25217).
This commit is contained in:
Rémi Verschelde 2019-02-16 12:45:18 +01:00 committed by GitHub
commit 2293559c9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -4559,6 +4559,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
snap_grid = true;
snap_guides = true;
snap_rotation = false;
snap_relative = false;
snap_pixel = false;
skeleton_show_bones = true;

6
scene/resources/mesh.cpp
View file

@ -787,7 +787,6 @@ void ArrayMesh::add_surface_from_arrays(PrimitiveType p_primitive, const Array &
Surface s;
VisualServer::get_singleton()->mesh_add_surface_from_arrays(mesh, (VisualServer::PrimitiveType)p_primitive, p_arrays, p_blend_shapes, p_flags);
surfaces.push_back(s);
/* make aABB? */ {
@ -808,8 +807,9 @@ void ArrayMesh::add_surface_from_arrays(PrimitiveType p_primitive, const Array &
aabb.expand_to(vtx[i]);
}
surfaces.write[surfaces.size() - 1].aabb = aabb;
surfaces.write[surfaces.size() - 1].is_2d = arr.get_type() == Variant::POOL_VECTOR2_ARRAY;
s.aabb = aabb;
s.is_2d = arr.get_type() == Variant::POOL_VECTOR2_ARRAY;
surfaces.push_back(s);
_recompute_aabb();
}