diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-12-10 19:05:51 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-12-11 11:27:04 +0300 |
| commit | e4153946ad1e81c697b8d51d92a3e2f088d0af4d (patch) | |
| tree | 30dbd28be9cd7b26a257a66a02b4c83d5a37da96 /source/blender | |
| parent | d421f3cac81643828abfb2cb818ddc713060f2c1 (diff) | |
Fix T59005: no FCurve cleanup in the Timeline
as opposed to the 'real' Dopesheet e.g. keyframes were not merged when
placed on the same frame
Reviewers: brecht, aligorith, angavrilov
Maniphest Tasks: T59005
Differential Revision: https://developer.blender.org/D4061
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 2b1de15ceae..599bff810da 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6518,7 +6518,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) ob = ac.obact; - if (ELEM(ac.datatype, ANIMCONT_DOPESHEET, ANIMCONT_SHAPEKEY)) { + if (ELEM(ac.datatype, ANIMCONT_DOPESHEET, ANIMCONT_SHAPEKEY, ANIMCONT_TIMELINE)) { ListBase anim_data = {NULL, NULL}; bAnimListElem *ale; short filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/); |