diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-08 15:36:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 15:36:11 +0200 |
| commit | 3fd3dd10f774ba20409ab4a40040c22848eb26af (patch) | |
| tree | 9788b0aa02faddf60050eadd7e4015914e4272d8 /editor | |
| parent | a6552819b1d357c0ee1afdbec7485afafa544793 (diff) | |
| parent | ce7056bb8d037d489faa796f516f5631710f0564 (diff) | |
Merge pull request #18706 from Calinou/fix-3d-grid-color-hint
Fix the 3D grid color setting hints
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 6eae7be9d5..c4e6d18163 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -403,10 +403,10 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { _initial_set("editors/grid_map/pick_distance", 5000.0); _initial_set("editors/3d/primary_grid_color", Color::html("909090")); - hints["editors/3d/primary_grid_color"] = PropertyInfo(Variant::COLOR, "editors/3d/primary_grid_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + hints["editors/3d/primary_grid_color"] = PropertyInfo(Variant::COLOR, "editors/3d/primary_grid_color", PROPERTY_HINT_COLOR_NO_ALPHA, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); _initial_set("editors/3d/secondary_grid_color", Color::html("606060")); - hints["editors/3d/secondary_grid_color"] = PropertyInfo(Variant::COLOR, "editors/3d/secondary_grid_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + hints["editors/3d/secondary_grid_color"] = PropertyInfo(Variant::COLOR, "editors/3d/secondary_grid_color", PROPERTY_HINT_COLOR_NO_ALPHA, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); _initial_set("editors/3d/grid_size", 50); hints["editors/3d/grid_size"] = PropertyInfo(Variant::INT, "editors/3d/grid_size", PROPERTY_HINT_RANGE, "1,500,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); |