From 2386436520750a797df24c4ff3fa535288412f15 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 10 Jul 2018 08:16:45 +0200 Subject: Fix T55880: Crash dragging file into image editor Caused by b4ccec67429b4 --- source/blender/editors/interface/interface_templates.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/interface') 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; -- cgit v1.2.3