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

14
editor/editor_inspector.cpp
View File

@ -2656,13 +2656,15 @@ void EditorInspector::_update_script_class_properties(const Object &p_object, Li
} }
// NodeC -> C props... -> NodeB..C.. // NodeC -> C props... -> NodeB..C..
r_list.erase(script_variables); if (script_variables) {
List<PropertyInfo>::Element *to_delete = bottom->next(); r_list.erase(script_variables);
while (to_delete && !(to_delete->get().usage & PROPERTY_USAGE_CATEGORY)) { List<PropertyInfo>::Element *to_delete = bottom->next();
r_list.erase(to_delete); while (to_delete && !(to_delete->get().usage & PROPERTY_USAGE_CATEGORY)) {
to_delete = bottom->next(); r_list.erase(to_delete);
to_delete = bottom->next();
}
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) {