[Bf-blender-cvs] [596c3368f4b] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: 596c3368f4b09bdeec46e7b44abfc8bcb7ba8fcf
Author: Brecht Van Lommel
Date:   Tue Aug 21 19:08:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB596c3368f4b09bdeec46e7b44abfc8bcb7ba8fcf

Merge branch 'master' into blender2.8

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index ddcc19a3781,26facd25174..4e12dcc75d4
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -525,18 -536,32 +525,19 @@@ class USERPREF_PT_system(Panel)
          col.prop(system, "use_region_overlap")
  
          col.separator()
 +        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")
+         col.prop(system, "use_text_antialiasing", text="Anti-aliasing")
+         sub = col.column()
+         sub.active = system.use_text_antialiasing
+         sub.prop(system, "text_hinting", 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()