Browse Source

Fixed some crashers, closes #26393

Juan Linietsky 6 years ago
parent
commit
51b80f6857
2 changed files with 4 additions and 3 deletions
  1. 1 1
      drivers/gles2/rasterizer_storage_gles2.cpp
  2. 3 2
      scene/gui/graph_edit.cpp

+ 1 - 1
drivers/gles2/rasterizer_storage_gles2.cpp

@@ -2494,7 +2494,7 @@ void RasterizerStorageGLES2::mesh_remove_surface(RID p_mesh, int p_surface) {
 	Surface *surface = mesh->surfaces[p_surface];
 
 	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);

+ 3 - 2
scene/gui/graph_edit.cpp

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