Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 85a70e9756 - Show all commits

3
source/blender/editors/interface/interface_layout.cc
View File

@ -5809,7 +5809,6 @@ void uiLayoutSetTooltipFunc(uiLayout *layout,
if (copy_arg != nullptr && arg_used) { if (copy_arg != nullptr && arg_used) {
arg = copy_arg(arg); arg = copy_arg(arg);
} }
arg_used = true;
if (item->type == ITEM_BUTTON) { if (item->type == ITEM_BUTTON) {
uiButtonItem *bitem = (uiButtonItem *)item; uiButtonItem *bitem = (uiButtonItem *)item;
@ -5817,9 +5816,11 @@ void uiLayoutSetTooltipFunc(uiLayout *layout,
continue; continue;
} }
UI_but_func_tooltip_set(bitem->but, func, arg, free_arg); UI_but_func_tooltip_set(bitem->but, func, arg, free_arg);
arg_used = true;
} }
else { else {
uiLayoutSetTooltipFunc((uiLayout *)item, func, arg, copy_arg, free_arg); uiLayoutSetTooltipFunc((uiLayout *)item, func, arg, copy_arg, free_arg);
arg_used = true;
} }
} }