Merge branch 'master' into blender2.8

2018-08-21 19:08:23 +02:00
parent 794836c8f1 34029fc71a
commit 596c3368f4
10 changed files with 94 additions and 39 deletions
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -533,9 +533,10 @@ class USERPREF_PT_system(Panel):

        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")

        # 3. Column
        column = split.column()