godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

ProjectSettingsEditor: Make "Type" OptionButton item ids match corresponding Variant::Type enum values.

Browse Source
This commit is contained in:
kleonc
2021-04-20 18:50:36 +02:00
parent c36807994d
commit f8f12d0564
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/project_settings_editor.cpp
View File

@@ -102,10 +102,9 @@ void ProjectSettingsEditor::_add_setting() {
String setting = _get_setting_name(); String setting = _get_setting_name();
// Initialize the property with the default value for the given type. // Initialize the property with the default value for the given type.
// The type list starts at 1 (as we exclude Nil), so add 1 to the selected value.
Callable::CallError ce; Callable::CallError ce;
Variant value; Variant value;
Variant::construct(Variant::Type(type->get_selected() + 1), value, nullptr, 0, ce); Variant::construct(Variant::Type(type->get_selected_id()), value, nullptr, 0, ce);
undo_redo->create_action(TTR("Add Project Setting")); undo_redo->create_action(TTR("Add Project Setting"));
undo_redo->add_do_property(ps, setting, value); undo_redo->add_do_property(ps, setting, value);
@@ -584,7 +583,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
// There's no point in adding Nil types, and Object types // There's no point in adding Nil types, and Object types
// can't be serialized correctly in the project settings. // can't be serialized correctly in the project settings.
if (i != Variant::NIL && i != Variant::OBJECT) { if (i != Variant::NIL && i != Variant::OBJECT) {
type->add_item(Variant::get_type_name(Variant::Type(i))); type->add_item(Variant::get_type_name(Variant::Type(i)), i);
} }
} }