Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-05-15 12:51:20 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-05-15 12:51:20 +0300
commitcf1a945e5ad570e9ae159b569a2a3cfc11874f98 (patch)
tree2d1cc2ffb0950d89d4a37d42d3a106a0cfcba13e /source/blender
parent6f9819e5fd56985738941edc129422234dd30619 (diff)
Preferences: Default ViewportAA
Due to recent changes the default aa samples in the viewport was set to 16, but should have been 8. This is due to how the old viewport quality setting was interpreted by the workbench engine. This patch will respect the same way to version the viewport quality to viewport_aa as the workbench used to do this.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 30374e6c63d..909334ae26f 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -566,16 +566,16 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
const float GPU_VIEWPORT_QUALITY_TAA16 = 0.6f;
const float GPU_VIEWPORT_QUALITY_TAA32 = 0.8f;
- if (userdef->gpu_viewport_quality < GPU_VIEWPORT_QUALITY_FXAA) {
+ if (userdef->gpu_viewport_quality <= GPU_VIEWPORT_QUALITY_FXAA) {
userdef->viewport_aa = SCE_DISPLAY_AA_OFF;
}
- else if (userdef->gpu_viewport_quality < GPU_VIEWPORT_QUALITY_TAA8) {
+ else if (userdef->gpu_viewport_quality <= GPU_VIEWPORT_QUALITY_TAA8) {
userdef->viewport_aa = SCE_DISPLAY_AA_FXAA;
}
- else if (userdef->gpu_viewport_quality < GPU_VIEWPORT_QUALITY_TAA16) {
+ else if (userdef->gpu_viewport_quality <= GPU_VIEWPORT_QUALITY_TAA16) {
userdef->viewport_aa = SCE_DISPLAY_AA_SAMPLES_8;
}
- else if (userdef->gpu_viewport_quality < GPU_VIEWPORT_QUALITY_TAA32) {
+ else if (userdef->gpu_viewport_quality <= GPU_VIEWPORT_QUALITY_TAA32) {
userdef->viewport_aa = SCE_DISPLAY_AA_SAMPLES_16;
}
else {