Merge branch 'master' into blender2.8

2017-12-07 23:53:03 +11:00
parent 46f518e927 2e2e6e3bdb
commit 1c7cfa025c
46 changed files with 591 additions and 464 deletions
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -115,6 +115,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
        sub.active = md.use_object_offset
        sub.prop(md, "offset_object", text="")

+        row = layout.row()
+        split = row.split()
+        col = split.column()
+        col.label(text="UVs:")
+        sub = col.column(align=True)
+        sub.prop(md, "offset_u")
+        sub.prop(md, "offset_v")
        layout.separator()

        layout.prop(md, "start_cap")