From 06de1bddae65dca06ec44b996372ce6a6e8d70e8 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 2 Jul 2020 10:47:02 -0400 Subject: UI: Small Tweaks to Modifier Layouts for Consistency These changes are smaller, made based on feedback and a pass on all the layouts for clarity and consistency. The Multires modifier UI will be addressed in a separate patch. Here is an overview of the changes: Renaming Options: - Build: "Start" -> "Start Frame" - Curve: "From Radius" -> "Size from Radius" - Screw: "Calc Order" -> "Calculate Order" - Displace, Warp, Wave: "Texture Coordinates Object" -> "Object" Move Mode Toggle to Top & Expand: - Bevel, Boolean, Normal Edit, Subdivision Use Columns for Tighter Spacing: - Displace, Explode, Ocean, Particle Instance, Remesh, Shrinkwrap, Solidify, Warp, Weighted Normal, Wave Misc: - Bevel: Set inactive properties for vertex bevel - Mesh Sequence Cache: Remove box for cache file - Skin: Don't align "Mark Loose" and "Clear Loose" - Array: Expand relative offset subpanel by default - Array: Move start cap, end cap to a new subpanel - Bevel: Move width type above width Differential Revision: https://developer.blender.org/D8115 --- source/blender/modifiers/intern/MOD_remesh.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_remesh.c') diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 6fc564448c3..197d759c352 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -241,7 +241,7 @@ static void panel_draw(const bContext *C, Panel *panel) { uiLayout *layout = panel->layout; #ifdef WITH_MOD_REMESH - uiLayout *row; + uiLayout *row, *col; PointerRNA ptr; PointerRNA ob_ptr; @@ -253,16 +253,17 @@ static void panel_draw(const bContext *C, Panel *panel) uiLayoutSetPropSep(layout, true); + col = uiLayoutColumn(layout, false); if (mode == MOD_REMESH_VOXEL) { - uiItemR(layout, &ptr, "voxel_size", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "adaptivity", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "voxel_size", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "adaptivity", 0, NULL, ICON_NONE); } else { - uiItemR(layout, &ptr, "octree_depth", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "scale", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "octree_depth", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "scale", 0, NULL, ICON_NONE); if (mode == MOD_REMESH_SHARP_FEATURES) { - uiItemR(layout, &ptr, "sharpness", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "sharpness", 0, NULL, ICON_NONE); } uiItemR(layout, &ptr, "use_remove_disconnected", 0, NULL, ICON_NONE); -- cgit v1.2.3