blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: uiBut.flag had an internal flag out of the documented range 

Increase range of internal flags & order UI_SEARCH_FILTER_NO_MATCH
within this range, so public button flags aren't accidentally added
that overlap with internal flags.
This commit is contained in:
Campbell Barton 2021-04-20 15:44:21 +10:00
parent 5e82e77112
commit 8c5c55b8c9
Notes: blender-bot 2023-02-14 00:10:08 +01:00 
Referenced by commit e2af5030b9, Cleanup: comments
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/include/UI_interface.h
View File

@ -186,17 +186,17 @@ enum {
UI_RETURN_POPUP_OK = 1 << 5,
};
/* but->flag - general state flags. */
/** #uiBut.flag general state flags. */
enum {
/** Warning, the first 6 flags are internal. */
UI_BUT_ICON_SUBMENU = 1 << 6,
UI_BUT_ICON_PREVIEW = 1 << 7,
/* WARNING: the first 7 flags are internal (see #UI_SELECT definition). */
UI_BUT_ICON_SUBMENU = 1 << 7,
UI_BUT_ICON_PREVIEW = 1 << 8,
UI_BUT_NODE_LINK = 1 << 8,
UI_BUT_NODE_ACTIVE = 1 << 9,
UI_BUT_DRAG_LOCK = 1 << 10,
UI_BUT_NODE_LINK = 1 << 9,
UI_BUT_NODE_ACTIVE = 1 << 10,
UI_BUT_DRAG_LOCK = 1 << 11,
/** Grayed out and un-editable. */
UI_BUT_DISABLED = 1 << 11,
UI_BUT_DISABLED = 1 << 12,
UI_BUT_ANIMATED = 1 << 13,
UI_BUT_ANIMATED_KEY = 1 << 14,

3
source/blender/editors/interface/interface_intern.h
View File

@ -85,8 +85,7 @@ enum {
UI_HAS_ICON = (1 << 3),
UI_HIDDEN = (1 << 4),
UI_SELECT_DRAW = (1 << 5), /* Display selected, doesn't impact interaction. */
/** Property search filter is active and the button does not match. */
UI_SEARCH_FILTER_NO_MATCH = (1 << 12),
UI_SEARCH_FILTER_NO_MATCH = (1 << 6),
/* warn: rest of uiBut->flag in UI_interface.h */
};