diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-31 15:52:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-31 15:52:22 +0300 |
| commit | 70fdf0fe37b37e798a5e116415c8699e3d652481 (patch) | |
| tree | e3cc19476701686b9da48982df8b079101c00a5f /release | |
| parent | 0be064067a432da070add207a7f4a3201ce7f071 (diff) | |
| parent | ff693959d89aeb7f763e0286f6fe63bdde20057c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 17ec778a275..d94951341c1 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -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) diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index a098953699e..a37d61dd0af 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -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: |