[Bf-blender-cvs] [6f598ecc1af] blender-v2.83-release: Fix T75472 Crash on "Remove Empty Animation Data" in NLA editor
Sybren A. Stüvel
noreply at git.blender.org
Tue Apr 21 13:24:39 CEST 2020
Commit: 6f598ecc1af3d6e94d5a03097b20618452425859
Author: Sybren A. Stüvel
Date: Tue Apr 21 13:23:51 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB6f598ecc1af3d6e94d5a03097b20618452425859
Fix T75472 Crash on "Remove Empty Animation Data" in NLA editor
The `ANIMFILTER_NODUPLIS` option, to prevent duplicates in the list of
animation data to be freed, was missing. This caused a use-after-free.
===================================================================
M source/blender/editors/animation/anim_channels_edit.c
===================================================================
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index a1b1c7815d8..4e3dc3cb220 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2268,7 +2268,8 @@ static int animchannels_clean_empty_exec(bContext *C, wmOperator *UNUSED(op))
}
/* get animdata blocks */
- filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_ANIMDATA);
+ filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_ANIMDATA |
+ ANIMFILTER_NODUPLIS);
ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
for (ale = anim_data.first; ale; ale = ale->next) {
More information about the Bf-blender-cvs
mailing list