[Bf-blender-cvs] [c2bee16] temp_pie_max_items_fix: Correct RNA warning
Julian Eisel
noreply at git.blender.org
Mon Feb 15 21:20:39 CET 2016
Commit: c2bee161edc8a60a6470c3035fc37cd0066067a3
Author: Julian Eisel
Date: Mon Feb 15 21:19:43 2016 +0100
Branches: temp_pie_max_items_fix
https://developer.blender.org/rBc2bee161edc8a60a6470c3035fc37cd0066067a3
Correct RNA warning
===================================================================
M source/blender/editors/interface/interface_regions.c
===================================================================
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 8080234..1f9be64 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -3006,7 +3006,7 @@ static void ui_pie_menu_level_invoke(bContext *C, void *argN, void *arg2)
item_array, lvl->totitem);
}
else {
- RNA_warning("%s.%s, not an enum type", RNA_struct_identifier(ptr.type), lvl->propname);
+ RNA_warning("%s.%s not found", RNA_struct_identifier(ptr.type), lvl->propname);
}
UI_pie_menu_end(C, pie);
@@ -3022,7 +3022,6 @@ void ui_pie_menu_level_create(
const int totitem_parent = PIE_MAX_ITEMS - 1;
const int totitem_remain = totitem - totitem_parent;
size_t array_size = sizeof(EnumPropertyItem) * totitem_remain;
- uiBut *but;
/* used as but->func_argN so freeing is handled elsewhere */
EnumPropertyItem *remaining = MEM_mallocN(array_size + sizeof(EnumPropertyItem), "pie_level_item_array");
@@ -3042,8 +3041,8 @@ void ui_pie_menu_level_create(
lvl.flag = flag;
/* add a 'more' menu entry */
- but = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_PLUS, "More", 0, 0, UI_UNIT_X * 3, UI_UNIT_Y, NULL,
- 0.0f, 0.0f, 0.0f, 0.0f, "Show more items of this menu");
+ uiBut *but = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_PLUS, "More", 0, 0, UI_UNIT_X * 3, UI_UNIT_Y, NULL,
+ 0.0f, 0.0f, 0.0f, 0.0f, "Show more items of this menu");
UI_but_funcN_set(but, ui_pie_menu_level_invoke, remaining, &lvl);
}
More information about the Bf-blender-cvs
mailing list