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

Cleanup: use ELEM macro

Browse Source
This commit is contained in:
Campbell Barton
2020-11-06 12:30:59 +11:00
parent 7cb20d841d
commit aa3a4973a3
158 changed files with 280 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -702,10 +702,10 @@ static bool ui_but_equals_old(const uiBut *but, const uiBut *oldbut)
if (but->funcN != oldbut->funcN) {
return false;
}
if (oldbut->func_arg1 != oldbut && but->func_arg1 != oldbut->func_arg1) {
if (!ELEM(oldbut->func_arg1, oldbut, but->func_arg1)) {
return false;
}
if (oldbut->func_arg2 != oldbut && but->func_arg2 != oldbut->func_arg2) {
if (!ELEM(oldbut->func_arg2, oldbut, but->func_arg2)) {
return false;
}
if (!but->funcN && ((but->poin != oldbut->poin && (uiBut *)oldbut->poin != oldbut) ||