[Bf-blender-cvs] [520b7b28872] modifier-panels-ui: Rename panel to panelRegister
Hans Goudey
noreply at git.blender.org
Tue Mar 31 19:11:41 CEST 2020
Commit: 520b7b28872cb1167e4807cd4d568bcdb99da369
Author: Hans Goudey
Date: Mon Mar 30 16:01:02 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rB520b7b28872cb1167e4807cd4d568bcdb99da369
Rename panel to panelRegister
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluid.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.cc
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shapekey.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_smooth.c
M source/blender/modifiers/intern/MOD_softbody.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_triangulate.c
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weighted_normal.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_weld.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 33b73152d5f..4773e9b1d17 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -343,8 +343,8 @@ typedef struct ModifierTypeInfo {
*/
void (*freeRuntimeData)(void *runtime_data);
- /* Define the modifier's UI panels. */
- void (*panel)(struct ARegionType *region_type);
+ /* Register the panel types for the modifier's UI. */
+ void (*panelRegister)(struct ARegionType *region_type);
} ModifierTypeInfo;
#define MODIFIER_TYPE_PANEL_PREFIX "MOD_PT_"
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index e0a073c0307..71b25e7aca4 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1984,7 +1984,7 @@ void uiTemplateModifiers(uiLayout *UNUSED(layout), bContext *C)
md = ob->modifiers.first;
for (i = 0; md; i++, md = md->next) {
const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
- if (mti->panel) {
+ if (mti->panelRegister) {
PanelType *panel_type = panel_type_from_modifier_type(region, md->type);
BLI_assert(panel_type != NULL);
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 12608d86bec..f8e8eb5287b 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -639,8 +639,8 @@ void ED_spacetype_buttons(void)
* per modifier type. */
for (int i = 0; i < NUM_MODIFIER_TYPES; i++) {
const ModifierTypeInfo *mti = modifierType_getInfo(i);
- if (mti != NULL && mti->panel != NULL) {
- mti->panel(art);
+ if (mti != NULL && mti->panelRegister != NULL) {
+ mti->panelRegister(art);
}
}
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 35600535bc5..2ca876f5ec2 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -884,7 +884,7 @@ static void array_merge_panel_draw(const bContext *C, Panel *panel)
uiItemR(col, &ptr, "merge_threshold", 0, IFACE_("Distance"), ICON_NONE);
}
-static void panel(ARegionType *region_type)
+static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = modifier_panel_register(region_type, "Array", panel_draw);
modifier_subpanel_register(region_type,
@@ -924,5 +924,5 @@ ModifierTypeInfo modifierType_Array = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ panel,
+ /* panelRegister */ panelRegister,
};
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 99f2d604d70..9b1f509c35c 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -383,7 +383,7 @@ static void custom_profile_panel_draw(const bContext *C, Panel *panel)
uiTemplateCurveProfile(layout, &ptr, "custom_profile");
}
-static void panel(ARegionType *region_type)
+static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = modifier_panel_register(region_type, "Bevel", panel_draw);
modifier_subpanel_register(
@@ -421,5 +421,5 @@ ModifierTypeInfo modifierType_Bevel = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* uiPanel */ panel,
+ /* uiPanel */ panelRegister,
};
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index ddd48341669..ac21720cb76 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -381,7 +381,7 @@ static void panel_draw(const bContext *C, Panel *panel)
}
}
-static void panel(ARegionType *region_type)
+static void panelRegister(ARegionType *region_type)
{
modifier_panel_register(region_type, "Boolean", panel_draw);
}
@@ -412,5 +412,5 @@ ModifierTypeInfo modifierType_Boolean = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ panel,
+ /* panelRegister */ panelRegister,
};
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index c475d4c5338..c22f9d52d15 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -322,5 +322,5 @@ ModifierTypeInfo modifierType_Build = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 65eae6aa003..d9df53d20f2 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -591,5 +591,5 @@ ModifierTypeInfo modifierType_Cast = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index 99be032653f..42a17111101 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -290,5 +290,5 @@ ModifierTypeInfo modifierType_Cloth = {
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 2e6b2ca3b7f..9526214f1ec 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -277,5 +277,5 @@ ModifierTypeInfo modifierType_Collision = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index ff6613a628e..4e750a6ea93 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -829,5 +829,5 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c
index 6433856f5c1..3ee67540aac 100644
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@ -206,5 +206,5 @@ ModifierTypeInfo modifierType_Curve = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 3e21fa7bb8b..20d3940fb55 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -393,7 +393,7 @@ static void face_panel_draw(const bContext *C, Panel *panel)
uiItemR(row, &ptr, "data_types_polys", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
}
-static void panel(ARegionType *region_type)
+static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = modifier_panel_register(region_type, "DataTransfer", panel_draw);
modifier_subpanel_register(region_type,
@@ -456,5 +456,5 @@ ModifierTypeInfo modifierType_DataTransfer = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ panel,
+ /* panelRegister */ panelRegister,
};
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 41bd34a4e89..f8720c97c0a 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -293,5 +293,5 @@ ModifierTypeInfo modifierType_Decimate = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index a3f189bac24..5f53137d254 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -486,5 +486,5 @@ ModifierTypeInfo modifierType_Displace = {
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ foreachTexLink,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index 454d99cc7ef..db6ef123460 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -210,5 +210,5 @@ ModifierTypeInfo modifierType_DynamicPaint = {
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ foreachTexLink,
/* freeRuntimeData */ freeRuntimeData,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index faac851610a..f49f84d8dc5 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -175,5 +175,5 @@ ModifierTypeInfo modifierType_EdgeSplit = {
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
- /* panel */ NULL,
+ /* panelRegister */ NULL,
};
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index c3fd98b2abe..eb230f65d4d 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list