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

Merge pull request #32409 from bojidar-bg/32334-null-ptr-esgp 

Fix crash in ~EditorSpatialGizmoPlugin when generating documentation data
This commit is contained in:
Rémi Verschelde 2019-09-28 11:26:37 +02:00 committed by GitHub
parent 3481c47e71 faf0a49cbf
commit b0f0e0e2fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/plugins/spatial_editor_plugin.cpp
View File

@ -4062,7 +4062,6 @@ void _update_all_gizmos(Node *p_node) {
void SpatialEditor::update_all_gizmos(Node *p_node) { void SpatialEditor::update_all_gizmos(Node *p_node) {
if (!p_node) { if (!p_node) {
if (!SceneTree::get_singleton()) return;
p_node = SceneTree::get_singleton()->get_root(); p_node = SceneTree::get_singleton()->get_root();
} }
_update_all_gizmos(p_node); _update_all_gizmos(p_node);
@ -6269,5 +6268,7 @@ EditorSpatialGizmoPlugin::~EditorSpatialGizmoPlugin() {
current_gizmos[i]->set_plugin(NULL); current_gizmos[i]->set_plugin(NULL);
current_gizmos[i]->get_spatial_node()->set_gizmo(NULL); current_gizmos[i]->get_spatial_node()->set_gizmo(NULL);
} }
if (SpatialEditor::get_singleton()) {
SpatialEditor::get_singleton()->update_all_gizmos(); SpatialEditor::get_singleton()->update_all_gizmos();
} }
}