diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-10 08:41:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-10 08:41:34 +0300 |
commit | 7e020e70d9ce5e970ff12313f5565e13545058bb (patch) | |
tree | 2f84ece97237206e6c425323bed3a6f370ae07e0 /source/blender/editors/interface/interface.c | |
parent | b548b3d57ea16fa46797cc80ceef54c2c42029d9 (diff) |
Fix T70691: Crash picking object from eyedropper
Caused by 828905190e124
Diffstat (limited to 'source/blender/editors/interface/interface.c')
-rw-r--r-- | source/blender/editors/interface/interface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index f05100e9065..429563472e4 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -786,6 +786,8 @@ static bool ui_but_update_from_old_block(const bContext *C, oldbut->flag = (oldbut->flag & ~flag_copy) | (but->flag & flag_copy); oldbut->drawflag = (oldbut->drawflag & ~drawflag_copy) | (but->drawflag & drawflag_copy); + SWAP(ListBase, but->extra_op_icons, oldbut->extra_op_icons); + /* copy hardmin for list rows to prevent 'sticking' highlight to mouse position * when scrolling without moving mouse (see [#28432]) */ if (ELEM(oldbut->type, UI_BTYPE_ROW, UI_BTYPE_LISTROW)) { |