Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +9 -1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 297d2b5fa1 - Show all commits

8
source/blender/editors/interface/interface.cc
View File

@ -4585,8 +4585,16 @@ static uiBut *ui_def_but_rna(uiBlock *block,
#endif #endif
} }
/* #ICON_BLANK1 can be used to add padding of the size of an icon. This is fine to align
* multiple items within a menu, but not for the menu button that only shows the label then.
*/
if ((type == UI_BTYPE_MENU) && (item[i].icon == ICON_BLANK1)) {
icon = ICON_NONE;
}
else {
icon = item[i].icon; icon = item[i].icon;
} }
}
else { else {
if (!str) { if (!str) {
if (type == UI_BTYPE_MENU) { if (type == UI_BTYPE_MENU) {