Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2020-07-02 18:55:37 +0300
committerHans Goudey <h.goudey@me.com>2020-07-02 18:55:37 +0300
commit7099459245983fd731cf25baf4df0330d4b671e1 (patch)
treed1f7da4bfb8f34b702d3e259925c7a01d1b31836 /source/blender/modifiers
parent17b89f6dacba007bf3a2189b36ea335bc389b661 (diff)
UI: Use consistent order in ocean modifier
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_ocean.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index 873bdb7f120..cb5c67087c4 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -629,21 +629,23 @@ static void foam_panel_draw(const bContext *C, Panel *panel)
col = uiLayoutColumn(layout, false);
uiLayoutSetActive(col, use_foam);
- uiItemR(col, &ptr, "foam_coverage", 0, IFACE_("Coverage"), ICON_NONE);
-
- col = uiLayoutColumn(layout, true);
- uiLayoutSetActive(col, use_foam);
uiItemR(col, &ptr, "foam_layer_name", 0, IFACE_("Data Layer"), ICON_NONE);
+ uiItemR(col, &ptr, "foam_coverage", 0, IFACE_("Coverage"), ICON_NONE);
}
static void spray_panel_draw_header(const bContext *C, Panel *panel)
{
+ uiLayout *row;
uiLayout *layout = panel->layout;
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
- uiItemR(layout, &ptr, "use_spray", 0, IFACE_("Spray"), ICON_NONE);
+ bool use_foam = RNA_boolean_get(&ptr, "use_foam");
+
+ row = uiLayoutRow(layout, false);
+ uiLayoutSetActive(row, use_foam);
+ uiItemR(row, &ptr, "use_spray", 0, IFACE_("Spray"), ICON_NONE);
}
static void spray_panel_draw(const bContext *C, Panel *panel)