Merge branch 'antialiasing_sanitizer' into 'master'

Allow any integer number >= 0 for antialiasing level (#7414)

Closes #7414

See merge request OpenMW/openmw!3110

components/settings/categories/video.hpp

@@ -24,7 +24,7 @@ namespace Settings
         SettingValue<int> mScreen{ mIndex, "Video", "screen", makeMaxSanitizerInt(0) };
         SettingValue<bool> mMinimizeOnFocusLoss{ mIndex, "Video", "minimize on focus loss" };
         SettingValue<bool> mWindowBorder{ mIndex, "Video", "window border" };
-        SettingValue<int> mAntialiasing{ mIndex, "Video", "antialiasing", makeEnumSanitizerInt({ 0, 2, 4, 8, 16 }) };
+        SettingValue<int> mAntialiasing{ mIndex, "Video", "antialiasing", makeMaxSanitizerInt(0) };
         SettingValue<int> mVsyncMode{ mIndex, "Video", "vsync mode", makeEnumSanitizerInt({ 0, 1, 2 }) };
         SettingValue<float> mFramerateLimit{ mIndex, "Video", "framerate limit", makeMaxSanitizerFloat(0) };
         SettingValue<float> mContrast{ mIndex, "Video", "contrast", makeMaxStrictSanitizerFloat(0) };

docs/source/reference/modding/settings/video.rst

@@ -111,14 +111,14 @@ antialiasing
 ------------
 
 :Type:		integer
-:Range:		0, 2, 4, 8, 16
+:Range:		>= 0
 :Default:	0
 
 This setting controls anti-aliasing. Anti-aliasing is a technique designed to improve the appearance of polygon edges,
 so they do not appear to be "jagged".
 Anti-aliasing can smooth these edges at the cost of a minor reduction in the frame rate.
 A value of 0 disables anti-aliasing.
-Other powers of two (e.g. 2, 4, 8, 16) are supported according to the capabilities of your graphics hardware.
+Other values are supported according to the capabilities of your graphics hardware.
 Higher values do a better job of smoothing out the image but have a greater impact on frame rate.
 
 This setting can be configured from a list of valid choices in the Graphics panel of the OpenMW Launcher,

files/settings-default.cfg

@@ -624,7 +624,7 @@ minimize on focus loss = true
 # An operating system border is drawn around the OpenMW window.
 window border = true
 
-# Anti-aliasing reduces jagged polygon edges.  (0, 2, 4, 8, 16).
+# Anti-aliasing reduces jagged polygon edges.  (>=0).
 antialiasing = 0
 
 # Vertical syncing to reduce tearing defects.