Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 06:24:12 +0000 (16:24 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 06:24:12 +0000 (16:24 +1000)
1  2 
release/scripts/startup/bl_ui/space_userpref.py
source/blender/editors/interface/interface_style.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

index ed0389942ad7d471603f21908e8450e4b57fc30a,e0902dd86362c4b630849866f02888096f057b39..53aaff7c4bf3cbe15282cceeb182425894953180
@@@ -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()