diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-21 01:19:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 01:19:23 +0100 |
| commit | 48ee9cd6902ed93a9307824eaa044dd8963d8435 (patch) | |
| tree | 850d5062b19db6dadefa36e9536f14c05908047b | |
| parent | 1e6ef9ae6e116d90ee57884f572ede408022409b (diff) | |
| parent | 3472c3f6ea0eb30464e28cd94f0d4bcc5fd9120d (diff) | |
Merge pull request #47123 from Calinou/tweak-3d-editor-grid-default-min-division
Tweak the 3D editor grid default to not go below subdivisions of 1 meter
| -rw-r--r-- | editor/editor_settings.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index ef1f8030fa..814925f5c6 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -620,8 +620,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { // is increased significantly more than it really should need to be. hints["editors/3d/grid_division_level_max"] = PropertyInfo(Variant::INT, "editors/3d/grid_division_level_max", PROPERTY_HINT_RANGE, "-1,3,1", PROPERTY_USAGE_DEFAULT); - // Default smallest grid size is 1cm, 10^-2. - _initial_set("editors/3d/grid_division_level_min", -2); + // Default smallest grid size is 1m, 10^0. + _initial_set("editors/3d/grid_division_level_min", 0); // Lower values produce graphical artifacts regardless of view clipping planes, so limit to -2 as a lower bound. hints["editors/3d/grid_division_level_min"] = PropertyInfo(Variant::INT, "editors/3d/grid_division_level_min", PROPERTY_HINT_RANGE, "-2,2,1", PROPERTY_USAGE_DEFAULT); diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 1d08a7821d..449968eb7b 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -5820,7 +5820,7 @@ void Node3DEditor::_init_grid() { // Offsets division_level for bigger or smaller grids. // Default value is -0.2. -1.0 gives Blender-like behavior, 0.5 gives huge grids. real_t division_level_bias = EditorSettings::get_singleton()->get("editors/3d/grid_division_level_bias"); - // Default largest grid size is 100m, 10^2 (default value is 2). + // Default largest grid size is 8^2 when primary_grid_steps is 8 (64m apart, so primary grid lines are 512m apart). int division_level_max = EditorSettings::get_singleton()->get("editors/3d/grid_division_level_max"); // Default smallest grid size is 1cm, 10^-2 (default value is -2). int division_level_min = EditorSettings::get_singleton()->get("editors/3d/grid_division_level_min"); |