[Bf-blender-cvs] [ab14da272d8] blender2.8: Reverted T55880 fix by accident

[Campbell Barton]

Commit: ab14da272d8252eb20dc5f5285cf3d5d2e683216
Author: Campbell Barton
Date:   Tue Jul 10 08:34:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBab14da272d8252eb20dc5f5285cf3d5d2e683216

Reverted T55880 fix by accident

===================================================================

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 b56904b4caa..6110d5f3466 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -390,12 +390,14 @@ 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;