blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Julian Eisel 2022-05-31 12:29:41 +02:00
parent 9301cc74ee 765c16bbd0
commit 39c14f4e84
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -927,9 +927,12 @@ static void ui_but_update_old_active_from_new(uiBut *oldbut, uiBut *but)
BLI_strncpy(oldbut->strdata, but->strdata, sizeof(oldbut->strdata));
}
if (but->dragpoin && (but->dragflag & UI_BUT_DRAGPOIN_FREE)) {
if (but->dragpoin) {
SWAP(void *, but->dragpoin, oldbut->dragpoin);
}
if (but->imb) {
SWAP(ImBuf *, but->imb, oldbut->imb);
}
/* NOTE: if layout hasn't been applied yet, it uses old button pointers... */
}