[Bf-blender-cvs] [65344a6d198] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 65344a6d1980082383993eaebf94b5647834c55c
Author: Campbell Barton
Date:   Tue Jul 31 16:24:12 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB65344a6d1980082383993eaebf94b5647834c55c

Merge branch 'master' into blender2.8

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index ed0389942ad,e0902dd8636..53aaff7c4bf
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -530,7 -539,28 +530,9 @@@ class USERPREF_PT_system(Panel)
  
          col.label(text="Text Draw Options:")
          col.prop(system, "use_text_antialiasing")
+         if system.use_text_antialiasing:
+             col.prop(system, "use_text_hinting")
  
 -        col.separator()
 -
 -        col.label(text="Textures:")
 -        col.prop(system, "gl_texture_limit", text="Limit Size")
 -        col.prop(system, "texture_time_out", text="Time Out")
 -        col.prop(system, "texture_collection_rate", text="Collection Rate")
 -
 -        col.separator()
 -
 -        col.label(text="Images Draw Method:")
 -        col.prop(system, "image_draw_method", text="")
 -
 -        col.separator()
 -
 -        col.label(text="Sequencer/Clip Editor:")
 -        # currently disabled in the code
 -        # col.prop(system, "prefetch_frames")
 -        col.prop(system, "memory_cache_limit")
 -
          # 3. Column
          column = split.column()