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

Fix crash on scenes with tool scripts and mismatched node types

Browse Source
This commit is contained in:
SaracenOne 2021-08-27 14:32:28 +01:00
parent 00268e37a0
commit 1fbbe25cea
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_inspector.cpp
View File

@ -2656,6 +2656,7 @@ void EditorInspector::_update_script_class_properties(const Object &p_object, Li
} }
// NodeC -> C props... -> NodeB..C.. // NodeC -> C props... -> NodeB..C..
if (script_variables) {
r_list.erase(script_variables); r_list.erase(script_variables);
List<PropertyInfo>::Element *to_delete = bottom->next(); List<PropertyInfo>::Element *to_delete = bottom->next();
while (to_delete && !(to_delete->get().usage & PROPERTY_USAGE_CATEGORY)) { while (to_delete && !(to_delete->get().usage & PROPERTY_USAGE_CATEGORY)) {
@ -2664,6 +2665,7 @@ void EditorInspector::_update_script_class_properties(const Object &p_object, Li
} }
r_list.erase(bottom); r_list.erase(bottom);
} }
}
void EditorInspector::set_restrict_to_basic_settings(bool p_restrict) { void EditorInspector::set_restrict_to_basic_settings(bool p_restrict) {
restrict_to_basic = p_restrict; restrict_to_basic = p_restrict;