Browse Source

Merge pull request #25524 from Calinou/fix-font-oversampling-warning

Fix a font oversampling warning being printed when it shouldn't
Rémi Verschelde 6 years ago
parent
commit
3dd00e77b4
1 changed files with 4 additions and 3 deletions
  1. 4 3
      scene/main/scene_tree.cpp

+ 4 - 3
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