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

Don't allow adding Objects to the project settings

Browse Source 
Godot doesn't support serializing objects.

This closes #33667.

(cherry picked from commit 7b84f4fc31)
This commit is contained in:
Hugo Locurcio
2020-10-07 14:27:25 +02:00
committed by Rémi Verschelde
parent 52e674ded1
commit 952a089551
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/project_settings_editor.cpp
View File

@ -1827,9 +1827,12 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
type->set_h_size_flags(Control::SIZE_EXPAND_FILL);
add_prop_bar->add_child(type);
// Start at 1 to avoid adding "Nil" as an option
for (int i = 1; i < Variant::VARIANT_MAX; i++) {
type->add_item(Variant::get_type_name(Variant::Type(i)));
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
// There's no point in adding Nil types, and Object types
// can't be serialized correctly in the project settings.
if (i != Variant::NIL && i != Variant::OBJECT) {
type->add_item(Variant::get_type_name(Variant::Type(i)));
}
}
Button *add = memnew(Button);