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>2018-06-18 09:51:29 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-06-18 09:54:08 +0300
commit04e2a5cef419a9fcfac0bdd92496815ae7bb2af3 (patch)
treed2debcc2e412775838dcb87dc50200fc15400da9 /release
parent79546a4eb6fef478e005ffc15177ca17b3866127 (diff)
Refactor: Put ViewportAA as UserPref
By default users want AA in the viewport. For slower systems you want to be able to turn it off. As in the future we would also like to support TAA in the viewport we introduced it as a Max Viewport AA settings. Also removed the drawoption to enable/disable AA per viewport When rendering the AA is always turned on.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py4
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 4f07bbb43f0..c929a3c0f7d 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -545,6 +545,10 @@ class USERPREF_PT_system(Panel):
col.prop(system, "use_region_overlap")
col.separator()
+ col.label(text="Max Viewport Anti-aliasing Method")
+ col.prop(system, "max_anti_alias_method", text="")
+
+ col.separator()
col.label(text="Text Draw Options:")
col.prop(system, "use_text_antialiasing")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 3cf85d23f59..fe1d23b4225 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3730,9 +3730,6 @@ class VIEW3D_PT_shading_options(Panel):
sub.prop(shading, "object_outline_color", text="")
layout.prop(view, "show_world")
- row = layout.split(0.4)
- row.active = not shading.show_xray
- row.prop(shading, "show_anti_aliasing")
class VIEW3D_PT_overlay(Panel):