summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-10-13 10:50:19 +0200
committerGitHub <noreply@github.com>2020-10-13 10:50:19 +0200
commit2965d519cb54cadbc745d55a506a55d5d77769e8 (patch)
tree93320ea1d01212c0009bbf441d8722b400fd1a0e
parent5782b3355a9174f85d1ef18da7cea22a66c35ba5 (diff)
parent2ad5b7100b0642517197d8059a92029e58444d56 (diff)
Merge pull request #42748 from qarmin/dont_clear_twice
Don't try to compare freed object to nullptr
-rw-r--r--editor/shader_globals_editor.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/shader_globals_editor.cpp b/editor/shader_globals_editor.cpp
index aa88b0ef39..04fbac3463 100644
--- a/editor/shader_globals_editor.cpp
+++ b/editor/shader_globals_editor.cpp
@@ -437,6 +437,9 @@ void ShaderGlobalsEditor::_notification(int p_what) {
inspector->edit(interface);
}
}
+ if (p_what == NOTIFICATION_PREDELETE) {
+ inspector->edit(nullptr);
+ }
}
ShaderGlobalsEditor::ShaderGlobalsEditor() {
@@ -474,6 +477,5 @@ ShaderGlobalsEditor::ShaderGlobalsEditor() {
}
ShaderGlobalsEditor::~ShaderGlobalsEditor() {
- inspector->edit(nullptr);
memdelete(interface);
}