diff options
| author | Julian Eisel <julian@blender.org> | 2022-05-31 13:24:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-05-31 13:28:58 +0300 |
| commit | 765c16bbd08b06c2b17454bac695f51276f01e41 (patch) | |
| tree | b6174a721b3e69a00c48bfbde8f9dfa748f17a73 | |
| parent | 75ef51cc80c6906bf6a5ba484ae4be8ce1550ddc (diff) | |
Fix wrong asset dropped when dragging from loc. of just cleared asset
See previous commit for an explanation of what went wrong. Similar to
the fix there, we also have to update the dragged data (e.g. the
data-block) referenced by the button.
Committing separately since this could cause further issues.
| -rw-r--r-- | source/blender/editors/interface/interface.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index ffd9ab86ee3..76dead57b0a 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -927,7 +927,7 @@ 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) { |