archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-05-25 10:52:53 +02:00
parent 230943be2d 9812943931
commit 08da2826e0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface.c
View File

@@ -2887,7 +2887,7 @@ void ui_but_update_ex(uiBut *but, const bool validate)
switch (but->type) { switch (but->type) {
case UI_BTYPE_MENU: case UI_BTYPE_MENU:
if (BLI_rctf_size_x(&but->rect) > 24.0f) { if (BLI_rctf_size_x(&but->rect) >= (UI_UNIT_X * 2)) {
/* only needed for menus in popup blocks that don't recreate buttons on redraw */ /* only needed for menus in popup blocks that don't recreate buttons on redraw */
if (but->block->flag & UI_BLOCK_LOOP) { if (but->block->flag & UI_BLOCK_LOOP) {
if (but->rnaprop && (RNA_property_type(but->rnaprop) == PROP_ENUM)) { if (but->rnaprop && (RNA_property_type(but->rnaprop) == PROP_ENUM)) {

6
source/blender/windowmanager/intern/wm_keymap.c
View File

@@ -1215,9 +1215,11 @@ static wmKeyMapItem *wm_keymap_item_find_props(
/* look into multiple handler lists to find the item */ /* look into multiple handler lists to find the item */
if (win) { if (win) {
found = wm_keymap_item_find_handlers(C, &win->modalhandlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap); found = wm_keymap_item_find_handlers(
C, &win->modalhandlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
if (found == NULL) { if (found == NULL) {
found = wm_keymap_item_find_handlers(C, &win->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap); found = wm_keymap_item_find_handlers(
C, &win->handlers, opname, opcontext, properties, is_strict, is_hotkey, r_keymap);
} }
} }