diff options
| author | Julian Eisel <julian@blender.org> | 2022-05-31 13:29:41 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-05-31 13:29:41 +0300 |
| commit | 39c14f4e84c0813241659c9b56bef5a62d55e6c8 (patch) | |
| tree | cf6a2c7a1598585f25cdafeae1f340dfc4ab202c /source/blender | |
| parent | 9301cc74eeb8979db8778d7208e30e019adf57fb (diff) | |
| parent | 765c16bbd08b06c2b17454bac695f51276f01e41 (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index d6719f0aa9f..c12d6957a95 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -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... */ } |