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

Merge pull request #44218 from aaronfranke/grid-inst-err 

Fix trying to set grid visibility on an invalid instance
This commit is contained in:
Rémi Verschelde 2020-12-09 13:02:38 +01:00 committed by GitHub
parent 114f97ff11 8c1d94ebae
commit c567a97178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -4999,9 +4999,6 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
for (int i = 0; i < 3; ++i) {
if (grid_enable[i]) {
grid_visible[i] = grid_enabled;
if (grid_instance[i].is_valid()) {
RenderingServer::get_singleton()->instance_set_visible(grid_instance[i], grid_enabled);
}
}
}
_finish_grid();
@ -6160,7 +6157,6 @@ void Node3DEditor::clear() {
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), true);
for (int i = 0; i < 3; ++i) {
if (grid_enable[i]) {
RenderingServer::get_singleton()->instance_set_visible(grid_instance[i], true);
grid_visible[i] = true;
}
}