[Bf-blender-cvs] [26d0fb3aef9] master: Fix T78269: Mirror modifier lost UV offset only

[Hans Goudey]

Commit: 26d0fb3aef94a087c2bb05badc64274050ef3779
Author: Hans Goudey
Date:   Fri Jun 26 09:37:50 2020 -0400
Branches: master
https://developer.blender.org/rB26d0fb3aef94a087c2bb05badc64274050ef3779

Fix T78269: Mirror modifier lost UV offset only

Also fixed an issue with a decorator in the same subpanel

===================================================================

M	source/blender/modifiers/intern/MOD_mirror.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 6abea36df35..5f67d591e60 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -181,18 +181,17 @@ static void data_panel_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  col = uiLayoutColumnWithHeading(layout, false, IFACE_("Mirror U"));
-  row = uiLayoutRow(col, true);
+  col = uiLayoutColumn(layout, true);
+  row = uiLayoutRowWithHeading(col, true, IFACE_("Mirror U"));
   uiLayoutSetPropDecorate(row, false);
   sub = uiLayoutRow(row, true);
   uiItemR(sub, &ptr, "use_mirror_u", 0, "", ICON_NONE);
   sub = uiLayoutRow(sub, true);
   uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_mirror_u"));
   uiItemR(sub, &ptr, "mirror_offset_u", UI_ITEM_R_SLIDER, "", ICON_NONE);
-  uiItemDecoratorR(row, &ptr, "mirror_offset_v", 0);
+  uiItemDecoratorR(row, &ptr, "mirror_offset_u", 0);
 
-  col = uiLayoutColumnWithHeading(layout, false, "V");
-  row = uiLayoutRow(col, true);
+  row = uiLayoutRowWithHeading(col, true, IFACE_("V"));
   uiLayoutSetPropDecorate(row, false);
   sub = uiLayoutRow(row, true);
   uiItemR(sub, &ptr, "use_mirror_v", 0, "", ICON_NONE);
@@ -201,6 +200,10 @@ static void data_panel_draw(const bContext *C, Panel *panel)
   uiItemR(sub, &ptr, "mirror_offset_v", UI_ITEM_R_SLIDER, "", ICON_NONE);
   uiItemDecoratorR(row, &ptr, "mirror_offset_v", 0);
 
+  col = uiLayoutColumn(layout, true);
+  uiItemR(col, &ptr, "offset_u", UI_ITEM_R_SLIDER, IFACE_("Offset U"), ICON_NONE);
+  uiItemR(col, &ptr, "offset_v", UI_ITEM_R_SLIDER, IFACE_("V"), ICON_NONE);
+
   uiItemR(layout, &ptr, "use_mirror_vertex_groups", 0, IFACE_("Vertex Groups"), ICON_NONE);
   uiItemR(layout, &ptr, "use_mirror_udim", 0, IFACE_("Flip UDIM"), ICON_NONE);
 }