Skip to content

Commit

Permalink
ProjectSettingsEditor: Make "Type" OptionButton item ids match corres…
Browse files Browse the repository at this point in the history
…ponding Variant::Type enum values.
  • Loading branch information
kleonc committed Apr 20, 2021
1 parent c368079 commit f8f12d0
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions editor/project_settings_editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,9 @@ void ProjectSettingsEditor::_add_setting() {
String setting = _get_setting_name();

// 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;
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->add_do_property(ps, setting, value);
Expand Down Expand Up @@ -584,7 +583,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
// 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)));
type->add_item(Variant::get_type_name(Variant::Type(i)), i);
}
}

Expand Down

0 comments on commit f8f12d0

Please sign in to comment.