diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 09:16:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 09:17:20 +0300 |
commit | 2386436520750a797df24c4ff3fa535288412f15 (patch) | |
tree | 9b5d8aa66b1de917967d981d9d9ac99ee2a29797 /source/blender/editors | |
parent | fc20fa29082474c624de65c57e24e317049fd4c9 (diff) |
Fix T55880: Crash dragging file into image editor
Caused by b4ccec67429b4
Diffstat (limited to 'source/blender/editors')
-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 f80e4e486d6..6110d5f3466 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -390,12 +390,15 @@ static uiBlock *id_search_menu(bContext *C, ARegion *ar, void *arg_litem) /* for new/open operators */ void UI_context_active_but_prop_get_templateID( - bContext *C, - PointerRNA *r_ptr, PropertyRNA **r_prop) + bContext *C, + PointerRNA *r_ptr, PropertyRNA **r_prop) { TemplateID *template_ui; uiBut *but = UI_context_active_but_get(C); + memset(r_ptr, 0, sizeof(*r_ptr)); + *r_prop = NULL; + if (but && but->func_argN) { template_ui = but->func_argN; *r_ptr = template_ui->ptr; |