diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-08-18 18:24:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 18:24:20 +0200 |
| commit | 65730ab9f6fbae34bb161113161b43f8b3fcd4d2 (patch) | |
| tree | 144d54c6ea9637a98fd52061db8c5818c69c6dfe /core | |
| parent | f97280a0127950f5ae7d2e38f239ab9633afb041 (diff) | |
| parent | 8f54e8bfb54512b55de72047683ffc42ba64d748 (diff) | |
Merge pull request #41247 from EricEzaM/project-settings-fix-bugs-and-add-delete-confirmation
Fixed issues with adding custom project settings and added confirmation dialog when deleting settings.
Diffstat (limited to 'core')
| -rw-r--r-- | core/project_settings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/project_settings.h b/core/project_settings.h index 686f6f3873..70b54ec854 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -76,8 +76,8 @@ protected: }; bool registering_order = true; - int last_order = 0; - int last_builtin_order = NO_BUILTIN_ORDER_BASE; + int last_order = NO_BUILTIN_ORDER_BASE; + int last_builtin_order = 0; Map<StringName, VariantContainer> props; String resource_path; Map<StringName, PropertyInfo> custom_prop_info; |