[Bf-blender-cvs] [23864365207] blender2.8: Fix T55880: Crash dragging file into image editor
Campbell Barton
noreply at git.blender.org
Tue Jul 10 08:17:59 CEST 2018
Commit: 2386436520750a797df24c4ff3fa535288412f15
Author: Campbell Barton
Date: Tue Jul 10 08:16:45 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2386436520750a797df24c4ff3fa535288412f15
Fix T55880: Crash dragging file into image editor
Caused by b4ccec67429b4
===================================================================
M source/blender/editors/interface/interface_templates.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list