Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Rename server "free" functions to "free_rid" to match exposed API

Browse source
This commit is contained in:
Aaron Franke 2025-06-05 00:49:35 -07:00
parent 4d231b5bf8
commit 9fbf5808a0
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
158 changed files with 724 additions and 696 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/gridmap/editor/grid_map_editor_plugin.cpp
View file

@ -507,7 +507,7 @@ void GridMapEditor::_clear_clipboard_data() {
if (E.instance.is_null()) {
continue;
}
RenderingServer::get_singleton()->free(E.instance);
RenderingServer::get_singleton()->free_rid(E.instance);
}
clipboard_items.clear();
@ -1172,16 +1172,16 @@ void GridMapEditor::_notification(int p_what) {
_clear_clipboard_data();
for (int i = 0; i < 3; i++) {
RS::get_singleton()->free(grid_instance[i]);
RS::get_singleton()->free(grid[i]);
RS::get_singleton()->free_rid(grid_instance[i]);
RS::get_singleton()->free_rid(grid[i]);
grid_instance[i] = RID();
grid[i] = RID();
RenderingServer::get_singleton()->free(selection_level_instance[i]);
RenderingServer::get_singleton()->free_rid(selection_level_instance[i]);
}
RenderingServer::get_singleton()->free(cursor_instance);
RenderingServer::get_singleton()->free(selection_instance);
RenderingServer::get_singleton()->free(paste_instance);
RenderingServer::get_singleton()->free_rid(cursor_instance);
RenderingServer::get_singleton()->free_rid(selection_instance);
RenderingServer::get_singleton()->free_rid(paste_instance);
cursor_instance = RID();
selection_instance = RID();
paste_instance = RID();
@ -1233,7 +1233,7 @@ void GridMapEditor::_update_cursor_instance() {
}
if (cursor_instance.is_valid()) {
RenderingServer::get_singleton()->free(cursor_instance);
RenderingServer::get_singleton()->free_rid(cursor_instance);
}
cursor_instance = RID();
@ -1721,32 +1721,32 @@ GridMapEditor::~GridMapEditor() {
for (int i = 0; i < 3; i++) {
if (grid[i].is_valid()) {
RenderingServer::get_singleton()->free(grid[i]);
RenderingServer::get_singleton()->free_rid(grid[i]);
}
if (grid_instance[i].is_valid()) {
RenderingServer::get_singleton()->free(grid_instance[i]);
RenderingServer::get_singleton()->free_rid(grid_instance[i]);
}
if (selection_level_instance[i].is_valid()) {
RenderingServer::get_singleton()->free(selection_level_instance[i]);
RenderingServer::get_singleton()->free_rid(selection_level_instance[i]);
}
if (selection_level_mesh[i].is_valid()) {
RenderingServer::get_singleton()->free(selection_level_mesh[i]);
RenderingServer::get_singleton()->free_rid(selection_level_mesh[i]);
}
}
RenderingServer::get_singleton()->free(cursor_mesh);
RenderingServer::get_singleton()->free_rid(cursor_mesh);
if (cursor_instance.is_valid()) {
RenderingServer::get_singleton()->free(cursor_instance);
RenderingServer::get_singleton()->free_rid(cursor_instance);
}
RenderingServer::get_singleton()->free(selection_mesh);
RenderingServer::get_singleton()->free_rid(selection_mesh);
if (selection_instance.is_valid()) {
RenderingServer::get_singleton()->free(selection_instance);
RenderingServer::get_singleton()->free_rid(selection_instance);
}
RenderingServer::get_singleton()->free(paste_mesh);
RenderingServer::get_singleton()->free_rid(paste_mesh);
if (paste_instance.is_valid()) {
RenderingServer::get_singleton()->free(paste_instance);
RenderingServer::get_singleton()->free_rid(paste_instance);
}
}