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

[Antonioya]

Commit: 48c96f6f013943e9d23ef7f3d7f5e08ca223d720
Author: Antonioya
Date:   Tue Jul 31 09:54:05 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB48c96f6f013943e9d23ef7f3d7f5e08ca223d720

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index deeb4ed7519,53aaff7c4bf..52d4640806d
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -529,12 -527,11 +529,14 @@@ class USERPREF_PT_system(Panel)
          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")
+         if system.use_text_antialiasing:
+             col.prop(system, "use_text_hinting")
  
          # 3. Column
          column = split.column()