Merge branch 'master' into blender2.8

2017-06-01 16:31:56 +02:00
parent 3bc8e88643 e5d8b04abe
commit 237e17a957
51 changed files with 733 additions and 1159 deletions
--- a/release/scripts/startup/bl_ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -371,10 +371,10 @@ class DATA_PT_paragraph(CurveButtonsPanelText, Panel):
        text = context.curve

        layout.label(text="Horizontal Alignment:")
-        layout.prop(text, "align_x", expand=True)
+        layout.row().prop(text, "align_x", expand=True)

        layout.label(text="Vertical Alignment:")
-        layout.prop(text, "align_y", expand=True)
+        layout.row().prop(text, "align_y", expand=True)

        split = layout.split()