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

[Antonio Vazquez]

Commit: 556f23ab5035c8b7485a4194c3088fe3c3235ee9
Author: Antonio Vazquez
Date:   Mon Jun 18 11:08:16 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB556f23ab5035c8b7485a4194c3088fe3c3235ee9

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/space_userpref.py

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index 16eef060428,c929a3c0f7d..96ee06c547c
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -544,13 -544,13 +544,16 @@@ class USERPREF_PT_system(Panel)
              col.separator()
          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="Grease Pencil Options:")
 +        col.prop(system, "gpencil_multi_sample", text="")
  
 -        col.label(text="Text Draw Options:")
 +        col.separator()
- 
-         col.label(text="Text Draw Options:")
++		col.label(text="Text Draw Options:")
          col.prop(system, "use_text_antialiasing")
  
          col.separator()