[Bf-blender-cvs] [4843b161d6c] master: Fix T99870 : Prevents crash when rearranging channels in dopesheet

Amelie Fondevilla noreply at git.blender.org
Wed Jul 27 11:43:53 CEST 2022


Commit: 4843b161d6cc14045f05d8df76f39795d5fcc6b3
Author: Amelie Fondevilla
Date:   Wed Jul 20 12:28:50 2022 +0200
Branches: master
https://developer.blender.org/rB4843b161d6cc14045f05d8df76f39795d5fcc6b3

Fix T99870 : Prevents crash when rearranging channels in dopesheet

The function to rearrange channels only works for F-curves channels for now, adding the `FCURVESONLY` filter prevents the function to be called for grease pencil channels, thereby fixing the crash.

Reviewed by : sybren
Differential Revision: http://developer.blender.org/D15504

===================================================================

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 8464f280c29..f371591c3a8 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -1498,7 +1498,8 @@ static int animchannels_rearrange_exec(bContext *C, wmOperator *op)
     int filter;
 
     /* get animdata blocks */
-    filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_ANIMDATA);
+    filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_ANIMDATA |
+              ANIMFILTER_FCURVESONLY);
     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