godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some crashers, closes #26393

Browse Source
This commit is contained in:
Juan Linietsky 2019-03-01 17:24:57 -03:00
parent 8a9119ad7f
commit 51b80f6857
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -2494,7 +2494,7 @@ void RasterizerStorageGLES2::mesh_remove_surface(RID p_mesh, int p_surface) {
Surface *surface = mesh->surfaces[p_surface]; Surface *surface = mesh->surfaces[p_surface];
if (surface->material.is_valid()) { if (surface->material.is_valid()) {
// TODO _material_remove_geometry(surface->material, mesh->surfaces[p_surface]); _material_remove_geometry(surface->material, mesh->surfaces[p_surface]);
} }
glDeleteBuffers(1, &surface->vertex_id); glDeleteBuffers(1, &surface->vertex_id);

3
scene/gui/graph_edit.cpp
View File

@ -261,8 +261,9 @@ void GraphEdit::add_child_notify(Node *p_child) {
void GraphEdit::remove_child_notify(Node *p_child) { void GraphEdit::remove_child_notify(Node *p_child) {
Control::remove_child_notify(p_child); Control::remove_child_notify(p_child);
if (is_inside_tree()) {
top_layer->call_deferred("raise"); //top layer always on top! top_layer->call_deferred("raise"); //top layer always on top!
}
GraphNode *gn = Object::cast_to<GraphNode>(p_child); GraphNode *gn = Object::cast_to<GraphNode>(p_child);
if (gn) { if (gn) {
gn->disconnect("offset_changed", this, "_graph_node_moved"); gn->disconnect("offset_changed", this, "_graph_node_moved");