Commit: 091832c955992ecd8fff6d88028075775e4b4e8e
Author: Ines Almeida
Date: Wed Apr 29 16:25:54 2015 +0100
Branches: master
https://developer.blender.org/rB091832c955992ecd8fff6d88028075775e4b4e8e
fix for double call to update callback in uiTemplateIconView
===================================================================
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 66de859..8d2ee04 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1697,14 +1697,11 @@ void uiTemplateIconView(uiLayout *layout, PointerRNA
*ptr, const char *propname)
cb->ptr = *ptr;
cb->prop = prop;
- but = uiDefBlockButN(block, ui_icon_view_menu_cb, MEM_dupallocN(cb),
"", 0, 0, UI_UNIT_X * 6, UI_UNIT_Y * 6, "");
+ but = uiDefBlockButN(block, ui_icon_view_menu_cb, cb, "", 0, 0,
UI_UNIT_X * 6, UI_UNIT_Y * 6, "");
but->icon = icon;
UI_but_flag_enable(but, UI_HAS_ICON | UI_BUT_ICON_PREVIEW);
-
- UI_but_funcN_set(but, rna_update_cb, MEM_dupallocN(cb), NULL);
-
- MEM_freeN(cb);
+
if (free_items) {
MEM_freeN(items);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
