[Bf-blender-cvs] [c0f481c7f2a] modifier-panels-ui: Remove open parameter from subpanel register
Hans Goudey
noreply at git.blender.org
Sat Apr 4 20:23:02 CEST 2020
Commit: c0f481c7f2af7de2935080109b0db72e6875a3a3
Author: Hans Goudey
Date: Sat Apr 4 13:22:47 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBc0f481c7f2af7de2935080109b0db72e6875a3a3
Remove open parameter from subpanel register
===================================================================
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_ui_common.c
M source/blender/modifiers/intern/MOD_ui_common.h
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index fafc90cccae..62ef627858a 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -837,7 +837,6 @@ static void panel_draw(const bContext *C, Panel *panel)
modifier_panel_end(layout, &ptr);
}
-
static void constant_offset_header_draw(const bContext *C, Panel *panel)
{
uiLayout *layout = panel->layout;
@@ -848,7 +847,6 @@ static void constant_offset_header_draw(const bContext *C, Panel *panel)
uiItemR(layout, &ptr, "use_constant_offset", 0, NULL, ICON_NONE);
}
-
static void constant_offset_draw(const bContext *C, Panel *panel)
{
uiLayout *layout = panel->layout;
@@ -864,7 +862,6 @@ static void constant_offset_draw(const bContext *C, Panel *panel)
uiItemR(col, &ptr, "constant_offset_displace", 0, "Distance", ICON_NONE);
}
-
static void relative_offset_header_draw(const bContext *C, Panel *panel)
{
uiLayout *layout = panel->layout;
@@ -875,7 +872,6 @@ static void relative_offset_header_draw(const bContext *C, Panel *panel)
uiItemR(layout, &ptr, "use_relative_offset", 0, NULL, ICON_NONE);
}
-
static void relative_offset_draw(const bContext *C, Panel *panel)
{
uiLayout *layout = panel->layout;
@@ -889,7 +885,6 @@ static void relative_offset_draw(const bContext *C, Panel *panel)
uiLayoutSetActive(col, RNA_boolean_get(&ptr, "use_relative_offset"));
uiItemR(col, &ptr, "relative_offset_displace", 0, "Distance", ICON_NONE);
-
}
static void object_offset_header_draw(const bContext *C, Panel *panel)
@@ -960,16 +955,27 @@ static void uv_panel_draw(const bContext *C, Panel *panel)
static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = modifier_panel_register(region_type, "Array", panel_draw);
+ modifier_subpanel_register(region_type,
+ "array_constant_offset",
+ "",
+ constant_offset_header_draw,
+ constant_offset_draw,
+ panel_type);
+ modifier_subpanel_register(region_type,
+ "array_relative_offset",
+ "",
+ relative_offset_header_draw,
+ relative_offset_draw,
+ panel_type);
+ modifier_subpanel_register(region_type,
+ "array_object_offset",
+ "",
+ object_offset_header_draw,
+ object_offset_draw,
+ panel_type);
modifier_subpanel_register(
- region_type, "array_constant_offset", "", constant_offset_header_draw, constant_offset_draw, false, panel_type);
- modifier_subpanel_register(
- region_type, "array_relative_offset", "", relative_offset_header_draw, relative_offset_draw, false, panel_type);
- modifier_subpanel_register(
- region_type, "array_object_offset", "", object_offset_header_draw, object_offset_draw, false, panel_type);
- modifier_subpanel_register(
- region_type, "array_merge", "", merge_header_draw, merge_panel_draw, false, panel_type);
- modifier_subpanel_register(
- region_type, "array_uv", "UVs", NULL, uv_panel_draw, false, panel_type);
+ region_type, "array_merge", "", merge_header_draw, merge_panel_draw, panel_type);
+ modifier_subpanel_register(region_type, "array_uv", "UVs", NULL, uv_panel_draw, panel_type);
}
ModifierTypeInfo modifierType_Array = {
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 58bdb7f7e23..34db351b902 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -388,13 +388,12 @@ static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = modifier_panel_register(region_type, "Bevel", panel_draw);
modifier_subpanel_register(
- region_type, "bevel_miters", "Miters", NULL, miter_panel_draw, false, panel_type);
+ region_type, "bevel_miters", "Miters", NULL, miter_panel_draw, panel_type);
modifier_subpanel_register(region_type,
"bevel_custom_profile",
"",
custom_profile_panel_draw_header,
custom_profile_panel_draw,
- false,
panel_type);
}
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index aa13efa4b8e..b09c76c5659 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -402,29 +402,17 @@ static void panelRegister(ARegionType *region_type)
"",
vertex_panel_draw_header,
vertex_panel_draw,
- false,
- panel_type);
- modifier_subpanel_register(region_type,
- "data_transfer_edge",
- "",
- edge_panel_draw_header,
- edge_panel_draw,
- false,
panel_type);
+ modifier_subpanel_register(
+ region_type, "data_transfer_edge", "", edge_panel_draw_header, edge_panel_draw, panel_type);
modifier_subpanel_register(region_type,
"data_transfer_face_corner",
"",
face_corner_panel_draw_header,
face_corner_panel_draw,
- false,
- panel_type);
- modifier_subpanel_register(region_type,
- "data_transfer_face",
- "",
- face_panel_draw_header,
- face_panel_draw,
- false,
panel_type);
+ modifier_subpanel_register(
+ region_type, "data_transfer_face", "", face_panel_draw_header, face_panel_draw, panel_type);
}
#undef HIGH_POLY_WARNING
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index c436925b454..3faaca37165 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -182,7 +182,6 @@ static void panelRegister(ARegionType *region_type)
"Edge Angle",
edge_angle_panel_draw_header,
edge_angle_panel_draw,
- false,
panel_type);
}
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c
index baa50e4c3c8..4595c2bc700 100644
--- a/source/blender/modifiers/intern/MOD_hook.c
+++ b/source/blender/modifiers/intern/MOD_hook.c
@@ -470,7 +470,7 @@ static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = modifier_panel_register(region_type, "Hook", panel_draw);
modifier_subpanel_register(
- region_type, "hook_falloff", "Falloff", NULL, falloff_panel_draw, true, panel_type);
+ region_type, "hook_falloff", "Falloff", NULL, falloff_panel_draw, panel_type);
}
ModifierTypeInfo modifierType_Hook = {
diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c
index 1871683d279..e1141c6df08 100644
--- a/source/blender/modifiers/intern/MOD_meshcache.c
+++ b/source/blender/modifiers/intern/MOD_meshcache.c
@@ -372,15 +372,9 @@ static void panelRegister(ARegionType *region_type)
"Time Remapping",
NULL,
time_remapping_panel_draw,
- false,
- panel_type);
- modifier_subpanel_register(region_type,
- "hook_axis_mapping",
- "Axis Mapping",
- NULL,
- axis_mapping_panel_draw,
- false,
panel_type);
+ modifier_subpanel_register(
+ region_type, "hook_axis_mapping", "Axis Mapping", NULL, axis_mapping_panel_draw, panel_type);
}
ModifierTypeInfo modifierType_MeshCache = {
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 577e52ff2c2..c54d90550ab 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -244,14 +244,12 @@ static void panelRegister(ARegionType *region_type)
"Cache File",
NULL,
cache_file_panel_draw,
- true,
panel_type);
modifier_subpanel_register(region_type,
"meshsequencecache_properties",
"Modifier",
NULL,
modifier_panel_draw,
- true,
panel_type);
}
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 8076ec9106c..e5c2dd338a9 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -209,9 +209,9 @@ static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = modifier_panel_register(region_type, "Mirror", panel_draw);
modifier_subpanel_register(
- region_type, "mirror_merge", "Merge", NULL, merge_panel_draw, false, panel_type);
+ region_type, "mirror_merge", "Merge", NULL, merge_panel_draw, panel_type);
modifier_subpanel_register(
- region_type, "mirror_textures", "Textures", NULL, textures_panel
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list