Commit: 43872124f78de03e55b567cf13fc88ff8edbef55
Author: Campbell Barton
Date: Sat Jun 23 10:45:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB43872124f78de03e55b567cf13fc88ff8edbef55
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/include/UI_interface.h
index 0b4817c8049,6227ea15b71..0666691607d
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -532,8 -497,9 +533,10 @@@ void UI_block_direction_set(uiBlock
void UI_block_order_flip(uiBlock *block);
void UI_block_flag_enable(uiBlock *block, int flag);
void UI_block_flag_disable(uiBlock *block, int flag);
+void UI_block_translate(uiBlock *block, int x, int y);
+ bool UI_block_is_empty(const uiBlock *block);
+
int UI_but_return_value_get(uiBut *but);
void UI_but_drag_set_id(uiBut *but, struct ID *id);
diff --cc source/blender/editors/interface/interface_handlers.c
index 9d202c87077,0654e4d5f1b..cb37c301031
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -6714,39 -6837,11 +6714,13 @@@ static void ui_but_menu_add_path_operat
RNA_string_set(&props_ptr, "filepath", dir);
}
- static void ui_but_menu_lazy_init(
- bContext *C, uiBut *but,
- uiPopupMenu **pup_p, uiLayout **layout_p)
- {
- if (*pup_p != NULL) {
- return;
- }
-
- uiStringInfo label = {BUT_GET_LABEL, NULL};
-
- /* highly unlikely getting the label ever fails */
- UI_but_string_info_get(C, but, &label, NULL);
-
- *pup_p = UI_popup_menu_begin(C, label.strinfo ? label.strinfo : "",
ICON_NONE);
- *layout_p = UI_popup_menu_layout(*pup_p);
- if (label.strinfo) {
- MEM_freeN(label.strinfo);
- }
- uiLayoutSetOperatorContext(*layout_p, WM_OP_INVOKE_DEFAULT);
- }
-
static bool ui_but_menu(bContext *C, uiBut *but)
{
- uiPopupMenu *pup = NULL;
- uiLayout *layout = NULL;
MenuType *mt = WM_menutype_find("WM_MT_button_context", true);
bool is_array, is_array_component;
+ wmOperatorType *ot;
+ PointerRNA op_ptr;
- /* if ((but->rnapoin.data && but->rnaprop) == 0 && but->optype == NULL)*/
- /* return 0;*/
-
/* having this menu for some buttons makes no sense */
if (but->type == UI_BTYPE_IMAGE) {
return false;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
