blender
/
blender
137
411
Fork 594
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

WIP: #104303: WM panel parent API #105193

Draft
Pratyaksh Raj wants to merge 2 commits from Pratyaksh-Raj/blender:WM-Panel-API into main
pull from: Pratyaksh-Raj/blender:WM-Panel-API
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 2 Files Changed 9 +61 -18
9 changed files with 61 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 24783dae41 - Show all commits

6
source/blender/editors/animation/fmodifier_ui.c
View File

@ -208,11 +208,13 @@ static PanelType *fmodifier_subpanel_register(ARegionType *region_type,
panel_type->poll = poll;
panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
BLI_assert(parent != NULL);
/* BLI_assert(parent != NULL);
Bastien Montagne commented 2023-03-06 14:23:18 +01:00
Review
Copy Link

WM_paneltype_subpanel_add(parent, pt, false); (you do not want to use order here).

` WM_paneltype_subpanel_add(parent, pt, false);` (you do not want to use order here).
BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
panel_type->parent = parent;
BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
BLI_addtail(&region_type->paneltypes, panel_type);
Bastien Montagne commented 2023-03-06 14:21:55 +01:00
Review
Copy Link

This line should not be removed, it's not handled by the call to WM_paneltype_subpanel_add.

This line should not be removed, it's not handled by the call to `WM_paneltype_subpanel_add`.
BLI_addtail(&region_type->paneltypes, panel_type);*/
Bastien Montagne commented 2023-02-27 12:09:51 +01:00
Review
Copy Link

Please remove code, do not comment it out. It makes patch less readable, and we do not want to keep dead code around.

Same for other cases below.

Please remove code, do not comment it out. It makes patch less readable, and we do not want to keep dead code around. Same for other cases below.
WM_paneltype_subpanel_add(parent, NULL, pt, true);
Bastien Montagne commented 2023-02-27 12:10:22 +01:00
Review
Copy Link

There are four parameters here, function only takes three of them...

Same for other cases below.

There are four parameters here, function only takes three of them... Same for other cases below.
return panel_type;
}

15
source/blender/editors/space_nla/nla_buttons.c
View File

@ -665,11 +665,12 @@ void nla_buttons_register(ARegionType *art)
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
pt->draw = nla_panel_evaluation;
pt->draw_header = nla_panel_animated_influence_header;
pt->parent = pt_properties;
// pt->parent = pt_properties;
pt->flag = PANEL_TYPE_DEFAULT_CLOSED;
pt->poll = nla_strip_eval_panel_poll;
Bastien Montagne commented 2023-03-06 14:23:07 +01:00
Review
Copy Link

WM_paneltype_subpanel_add(parent, pt, false); (you do not want to use order here).

` WM_paneltype_subpanel_add(parent, pt, false);` (you do not want to use order here).
BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
BLI_addtail(&art->paneltypes, pt);
// BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
// BLI_addtail(&art->paneltypes, pt);
Bastien Montagne commented 2023-03-06 14:23:00 +01:00
Review
Copy Link

Remove extra spaces...

Remove extra spaces...
WM_paneltype_subpanel_add(pt_properties, pt, true);
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel animated strip time");
strcpy(pt->idname, "NLA_PT_animated_strip_time");
@ -679,12 +680,12 @@ void nla_buttons_register(ARegionType *art)
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
pt->draw = nla_panel_animated_strip_time;
pt->draw_header = nla_panel_animated_strip_time_header;
pt->parent = pt_properties;
// pt->parent = pt_properties;
Bastien Montagne commented 2023-03-06 14:22:40 +01:00
Review
Copy Link

WM_paneltype_subpanel_add(parent, pt, false); (you do not want to use order here).

` WM_paneltype_subpanel_add(parent, pt, false);` (you do not want to use order here).
pt->flag = PANEL_TYPE_DEFAULT_CLOSED;
pt->poll = nla_strip_eval_panel_poll;
BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
BLI_addtail(&art->paneltypes, pt);
Bastien Montagne commented 2023-03-06 14:21:16 +01:00
Review
Copy Link

No need to remove that line

No need to remove that line
//BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
//BLI_addtail(&art->paneltypes, pt);
WM_paneltype_subpanel_add(pt_properties, pt, true);
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel modifiers");
strcpy(pt->idname, "NLA_PT_modifiers");
strcpy(pt->label, N_("Modifiers"));

6
source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
View File

@ -391,11 +391,13 @@ PanelType *gpencil_modifier_subpanel_register(ARegionType *region_type,
panel_type->poll = gpencil_modifier_ui_poll;
panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
BLI_assert(parent != NULL);
/* BLI_assert(parent != NULL);
Bastien Montagne commented 2023-03-06 14:22:33 +01:00
Review
Copy Link

WM_paneltype_subpanel_add(parent, pt, false); (you do not want to use order here).

` WM_paneltype_subpanel_add(parent, pt, false);` (you do not want to use order here).
BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
panel_type->parent = parent;
BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
BLI_addtail(&region_type->paneltypes, panel_type);
Bastien Montagne commented 2023-03-06 14:20:27 +01:00
Review
Copy Link

This line should not be removed, it's not handled by the call to WM_paneltype_subpanel_add.

This line should not be removed, it's not handled by the call to `WM_paneltype_subpanel_add`.
BLI_addtail(&region_type->paneltypes, panel_type);*/
WM_paneltype_subpanel_add(parent, NULL, pt, true);
return panel_type;
}

6
source/blender/makesrna/intern/rna_ui.c
View File

@ -389,7 +389,7 @@ static StructRNA *rna_Panel_register(Main *bmain,
}
/* Insert into list. */
BLI_insertlinkafter(&art->paneltypes, pt_iter, pt);
/* BLI_insertlinkafter(&art->paneltypes, pt_iter, pt);
if (parent) {
pt->parent = parent;
@ -410,7 +410,9 @@ static StructRNA *rna_Panel_register(Main *bmain,
}
}
WM_paneltype_add(pt);
WM_paneltype_add(pt); */
WM_paneltype_subpanel_add(parent, NULL, pt, true);
/* update while blender is running */
WM_main_add_notifier(NC_WINDOW, NULL);

6
source/blender/modifiers/intern/MOD_ui_common.c
View File

@ -483,11 +483,13 @@ PanelType *modifier_subpanel_register(ARegionType *region_type,
panel_type->poll = modifier_ui_poll;
panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
BLI_assert(parent != NULL);
/* BLI_assert(parent != NULL);
Bastien Montagne commented 2023-03-06 14:19:23 +01:00
Review
Copy Link

WM_paneltype_subpanel_add(parent, pt, false); (you do not want to use order here).

` WM_paneltype_subpanel_add(parent, pt, false);` (you do not want to use order here).
BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
panel_type->parent = parent;
BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
BLI_addtail(&region_type->paneltypes, panel_type);
Bastien Montagne commented 2023-03-06 14:19:47 +01:00
Review
Copy Link

This line should not be removed, it's not handled by the call to WM_paneltype_subpanel_add.

This line should not be removed, it's not handled by the call to `WM_paneltype_subpanel_add`.
BLI_addtail(&region_type->paneltypes, panel_type);*/
WM_paneltype_subpanel_add(parent, NULL, pt, true);
return panel_type;
}

6
source/blender/shader_fx/intern/FX_ui_common.c
View File

@ -262,11 +262,13 @@ PanelType *shaderfx_subpanel_register(ARegionType *region_type,
panel_type->poll = shaderfx_ui_poll;
panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
BLI_assert(parent != NULL);
/* BLI_assert(parent != NULL);
Bastien Montagne commented 2023-03-06 14:19:12 +01:00
Review
Copy Link

WM_paneltype_subpanel_add(parent, pt, false); (you do not want to use order here).

` WM_paneltype_subpanel_add(parent, pt, false);` (you do not want to use order here).
BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
panel_type->parent = parent;
BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
BLI_addtail(&region_type->paneltypes, panel_type);
Bastien Montagne commented 2023-03-06 14:18:38 +01:00
Review
Copy Link

This line should not be removed, it's not handled by the call to WM_paneltype_subpanel_add.

This line should not be removed, it's not handled by the call to `WM_paneltype_subpanel_add`.
BLI_addtail(&region_type->paneltypes, panel_type); */
WM_paneltype_subpanel_add(parent, NULL, pt, true);
return panel_type;
}

1
source/blender/windowmanager/WM_api.h
View File

@ -1154,6 +1154,7 @@ void WM_paneltype_init(void);
void WM_paneltype_clear(void);
struct PanelType *WM_paneltype_find(const char *idname, bool quiet);
bool WM_paneltype_add(struct PanelType *pt);
void WM_paneltype_subpanel_add(PanelType *pt, PanelType *parent, bool use_order);
void WM_paneltype_remove(struct PanelType *pt);
void WM_paneltype_idname_visit_for_search(const struct bContext *C,

31
source/blender/windowmanager/intern/wm_panel_type.c
View File

@ -46,6 +46,37 @@ bool WM_paneltype_add(PanelType *pt)
BLI_ghash_insert(g_paneltypes_hash, pt->idname, pt);
return true;
}
void WM_paneltype_subpanel_add(PanelType *pt, PanelType *parent, bool use_order)
Bastien Montagne commented 2023-02-27 12:26:31 +01:00
Review
Copy Link

Style: Please leave an empty line between function definitions.

Style: Please leave an empty line between function definitions.
{
pt->parent = parent;
if (parent) {
if (use_order) {
LinkData *pt_child_iter = parent->children.last;
for (; pt_child_iter; pt_child_iter = pt_child_iter->prev) {
PanelType *pt_child = pt_child_iter->data;
if (pt_child->order <= pt->order) {
break;
}
}
BLI_insertlinkafter(&parent->children, pt_child_iter, BLI_genericNodeN(pt));
}
else {
BLI_addtail(&parent->children, BLI_genericNodeN(pt));
}
BLI_addtail(&art->paneltypes, pt);
Bastien Montagne commented 2023-02-27 12:14:26 +01:00
Review
Copy Link

Wondering where art comes from here...? Missing parameter?

Wondering where `art` comes from here...? Missing parameter?
}
{
const char *owner_id = RNA_struct_state_owner_get();
if (owner_id) {
BLI_strncpy(pt->owner_id, owner_id, sizeof(pt->owner_id));
}
}
Bastien Montagne commented 2023-02-27 12:18:07 +01:00
Review
Copy Link

That block about the owner_id does not belong to that function, it's specific to the RNA registration code and should be kept there.

That block about the `owner_id` does not belong to that function, it's specific to the RNA registration code and should be kept there.
WM_paneltype_add(pt);
Bastien Montagne commented 2023-02-27 12:23:59 +01:00
Review
Copy Link

This should also be left out of this function, since it is not relevant to parenting a panel to another one, and not all panels need to be registered globally at the WM level.

This should also be left out of this function, since it is not relevant to parenting a panel to another one, and not all panels need to be registered globally at the WM level.
}
void WM_paneltype_remove(PanelType *pt)
{

2
source/tools

@ -1 +1 @@
Subproject commit e133fc08cd3254bb3d3bd1345028c8486700bca4
Subproject commit 27826b4aed138b7e3aed882d0eab96740c3a55c7
Bastien Montagne commented 2023-02-27 12:12:50 +01:00
Review
Copy Link

This should not be here, in fact this has been removed recently, you need to update your patch against latest main branch.

This should not be here, in fact this has been removed recently, you need to update your patch against latest `main` branch.
Pratyaksh Raj commented 2023-03-03 11:57:42 +01:00
Review
Copy Link

Sir In my 2nd commit there is no such submodule. Updated my main branch. Now For removing this should I need to change my branch and then put another PR?

Sir In my 2nd commit there is no such submodule. Updated my main branch. Now For removing this should I need to change my branch and then put another PR?
Bastien Montagne commented 2023-03-06 14:23:59 +01:00
Review
Copy Link

Yes just rebase on latest main branch, and force-push on your fork.

Yes just rebase on latest `main` branch, and force-push on your fork.