[Bf-blender-cvs] [b0ba7341bda] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Wed Jun 27 16:51:49 CEST 2018


Commit: b0ba7341bdaea9ffc5f01cdc6642cf76f1e04a10
Author: Antonio Vazquez
Date:   Wed Jun 27 16:51:39 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb0ba7341bdaea9ffc5f01cdc6642cf76f1e04a10

Merge branch 'blender2.8' into greasepencil-object

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index 82ca87c24f9,3b98a4e857f..0733dd278dc
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -550,14 -550,10 +550,13 @@@ 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.prop(system, "gpu_viewport_quality")
  
          col.separator()
 +        col.label(text="Grease Pencil Options:")
 +        col.prop(system, "gpencil_multi_sample", text="")
  
 +        col.separator()
          col.label(text="Text Draw Options:")
          col.prop(system, "use_text_antialiasing")



More information about the Bf-blender-cvs mailing list