diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-08-22 13:16:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-08-22 13:16:11 +0300 |
| commit | ba74704c9acec7b0791a28fa7d1627cf1321ec5d (patch) | |
| tree | f4358bae461665b4e3653fdc74d00f04a4899be2 /source/blender/editors/interface/interface_templates.c | |
| parent | ad577d3b6940a30af91e3d748efb65d1eacacfb0 (diff) | |
| parent | c973d333da31c139c69943f743a2f342be610cce (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 77837b96e86..4eee9927264 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -571,8 +571,11 @@ static uiBlock *id_search_menu(bContext *C, ARegion *region, void *arg_litem) /** \name ID Template * \{ */ -/* This is for browsing and editing the ID-blocks used */ +static void template_id_cb(bContext *C, void *arg_litem, void *arg_event); +/** + * This is for browsing and editing the ID-blocks used. + */ void UI_context_active_but_prop_get_templateID(bContext *C, PointerRNA *r_ptr, PropertyRNA **r_prop) @@ -582,7 +585,7 @@ void UI_context_active_but_prop_get_templateID(bContext *C, memset(r_ptr, 0, sizeof(*r_ptr)); *r_prop = NULL; - if (but && but->func_argN) { + if (but && (but->funcN == template_id_cb) && but->func_argN) { TemplateID *template_ui = but->func_argN; *r_ptr = template_ui->ptr; *r_prop = template_ui->prop; |