[Bf-blender-cvs] [2a4ab7ed9a5] soc-2019-outliner: Outliner Merged object search: Simplify memory free callback

[Nathan Craddock]

Commit: 2a4ab7ed9a54129b8d1ced4f31cb2f05bd59158a
Author: Nathan Craddock
Date:   Tue Aug 6 17:18:27 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB2a4ab7ed9a54129b8d1ced4f31cb2f05bd59158a

Outliner Merged object search: Simplify memory free callback

Rather than use custom callback, use MEM_freeN

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

M	source/blender/editors/space_outliner/outliner_tools.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index b64c42f994e..190e859e189 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -486,11 +486,6 @@ typedef struct MergedSearchData {
   TreeElement *select_element;
 } MergedSearchData;
 
-static void merged_element_search_free_cb(void *arg)
-{
-  MEM_freeN(arg);
-}
-
 static void merged_element_search_cb_recursive(
     const ListBase *tree, short tselem_type, short type, const char *str, uiSearchItems *items)
 {
@@ -590,7 +585,7 @@ void merged_element_search_menu_invoke(bContext *C,
   select_data->parent_element = parent_te;
   select_data->select_element = activate_te;
 
-  UI_popup_block_invoke(C, merged_element_search_menu, select_data, merged_element_search_free_cb);
+  UI_popup_block_invoke(C, merged_element_search_menu, select_data, MEM_freeN);
 }
 
 static void object_select_cb(bContext *C,