diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-08 11:52:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 11:52:45 +0100 |
| commit | 3dd00e77b4cd09e34e54a86216a2265862455557 (patch) | |
| tree | 036f6d690ac2f46410b243c32f67083bfefe976a | |
| parent | 6958953ffa1372e14725df92ae73fad53da924b1 (diff) | |
| parent | 355d65aa8d66b33c85c08d60e3d85ff44235ba3c (diff) | |
Merge pull request #25524 from Calinou/fix-font-oversampling-warning
Fix a font oversampling warning being printed when it shouldn't
| -rw-r--r-- | scene/main/scene_tree.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index f713851090..689f18a09d 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -1154,13 +1154,14 @@ void SceneTree::_update_root_rect() { float viewport_aspect = desired_res.aspect(); float video_mode_aspect = video_mode.aspect(); + if (use_font_oversampling && stretch_aspect == STRETCH_ASPECT_IGNORE) { + WARN_PRINT("Font oversampling only works with the resize modes 'Keep Width', 'Keep Height', and 'Expand'."); + } + if (stretch_aspect == STRETCH_ASPECT_IGNORE || ABS(viewport_aspect - video_mode_aspect) < CMP_EPSILON) { //same aspect or ignore aspect viewport_size = desired_res; screen_size = video_mode; - if (use_font_oversampling) { - WARN_PRINT("Font oversampling only works with the following resize modes 'Keep Width', 'Keep Height', and 'Expand'.") - } } else if (viewport_aspect < video_mode_aspect) { // screen ratio is smaller vertically |