[Bf-blender-cvs] [b47e8c1b941] modifier-panels-ui: Merge branch 'modifier-panels-ui' of git.blender.org:blender into modifier-panels-ui

[Hans Goudey]

Commit: b47e8c1b9415091cb33c1bfd9ecb94a7fc10e7f5
Author: Hans Goudey
Date:   Sun Apr 5 11:48:27 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBb47e8c1b9415091cb33c1bfd9ecb94a7fc10e7f5

Merge branch 'modifier-panels-ui' of git.blender.org:blender into modifier-panels-ui

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



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

diff --cc source/blender/modifiers/intern/MOD_decimate.c
index e34ab0ea5c4,0fc523a77c1..dad7eb3dcf2
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@@ -251,13 -253,9 +253,10 @@@ static void panel_draw(const bContext *
      row = uiLayoutRow(layout, true);
      uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, ICON_NONE);
      sub = uiLayoutColumn(row, true);
+     uiLayoutSetPropDecorate(sub, false);
      uiLayoutSetActive(sub, has_vertex_group);
 +    uiLayoutSetPropSep(sub, false);
      uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
- 
-     uiItemR(layout, &ptr, "use_collapse_triangulate", 0, NULL, ICON_NONE);
-     uiItemR(layout, &ptr, "use_symmetry", 0, NULL, ICON_NONE);
-     uiItemR(layout, &ptr, "symmetry_axis", UI_ITEM_R_EXPAND, IFACE_("Symmetry Axis"), ICON_NONE);
    }
    else if (decimate_type == MOD_DECIM_MODE_UNSUBDIV) {
      uiItemR(layout, &ptr, "iterations", 0, NULL, ICON_NONE);
diff --cc source/blender/modifiers/intern/MOD_surfacedeform.c
index 8b24f52ebdc,50cef8513cb..01998047da1
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@@ -1410,16 -1412,17 +1412,18 @@@ static void panel_draw(const bContext *
    col = uiLayoutColumn(layout, false);
    uiLayoutSetActive(col, !is_bound);
    uiItemR(col, &ptr, "target", 0, NULL, ICON_NONE);
+ 
+   uiItemR(col, &ptr, "falloff", 0, NULL, ICON_NONE);
+   uiItemR(col, &ptr, "strength", 0, NULL, ICON_NONE);
+ 
    row = uiLayoutRow(col, true);
-   uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", "", ICON_NONE);
+   uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, ICON_NONE);
    sub = uiLayoutRow(row, true);
+   uiLayoutSetPropDecorate(sub, false);
    uiLayoutSetActive(sub, has_vertex_group);
 +  uiLayoutSetPropSep(sub, false);
    uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
  
-   uiItemR(col, &ptr, "falloff", 0, NULL, ICON_NONE);
-   uiItemR(col, &ptr, "strength", 0, NULL, ICON_NONE);
- 
    uiItemS(layout);
  
    col = uiLayoutColumn(layout, false);