Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton
2017-03-31 23:52:22 +11:00
25 changed files with 225 additions and 127 deletions

View File

@@ -2092,7 +2092,7 @@ class WM_OT_addon_install(Operator):
# print message
msg = (
tip_("Modules Installed (%s) from %r into %r (%s)") %
tip_("Modules Installed (%s) from %r into %r") %
(", ".join(sorted(addons_new)), pyfile, path_addons)
)
print(msg)

View File

@@ -569,6 +569,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "use_mirror_u", text="U")
col.prop(md, "use_mirror_v", text="V")
col = layout.column(align=True)
if md.use_mirror_u:
col.prop(md, "mirror_offset_u")
if md.use_mirror_v:
col.prop(md, "mirror_offset_v")
col = layout.column()
if md.use_mirror_merge is True: