maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
(cherry picked from commit f8f12d0564)
This commit is contained in:
kleonc 2021-04-20 18:50:36 +02:00 committed by Rémi Verschelde
parent 1304b85c63
commit 7a776d68b6
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/project_settings_editor.cpp
View file

@ -840,9 +840,8 @@ void ProjectSettingsEditor::_item_adds(String) {
void ProjectSettingsEditor::_item_add() {
// 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.
Variant::CallError ce;
const Variant value = Variant::construct(Variant::Type(type->get_selected() + 1), NULL, 0, ce);
const Variant value = Variant::construct(Variant::Type(type->get_selected_id()), NULL, 0, ce);
String name = property->get_text().strip_edges();
@ -1826,7 +1825,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);
}
}