Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 21 Aug 2018 17:08:23 +0000 (19:08 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 21 Aug 2018 17:08:23 +0000 (19:08 +0200)
1  2 
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf_glyph.c
source/blender/editors/interface/interface_style.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

index ddcc19a37817bba2e3897d8ea90f679aeba8dd0d,26facd251748f163c1ebb57b9fbce95fe7ff2ac0..4e12dcc75d465fd3f8d3abe7f8680fb25dbd082e
@@@ -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()
  
Simple merge