Merge remote-tracking branch 'origin/master' into openvdbopenvdb

1 files changed, 19 insertions, 3 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py
index 33af812b6c4..3a3ad31a8ef 100644
--- 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()
 
@@ -431,5 +431,21 @@ class DATA_PT_custom_props_curve(CurveButtonsPanel, PropertyPanel, Panel):
     _context_path = "object.data"
     _property_type = bpy.types.Curve
 
+
+classes = (
+    DATA_PT_context_curve,
+    DATA_PT_shape_curve,
+    DATA_PT_curve_texture_space,
+    DATA_PT_geometry_curve,
+    DATA_PT_pathanim,
+    DATA_PT_active_spline,
+    DATA_PT_font,
+    DATA_PT_paragraph,
+    DATA_PT_text_boxes,
+    DATA_PT_custom_props_curve,
+)
+
 if __name__ == "__main__":  # only for live edit.
-    bpy.utils.register_module(__name__)
+    from bpy.utils import register_class
+    for cls in classes:
+        register_class(cls)