[Bf-blender-cvs] [e4153946ad1] blender2.8: Fix T59005: no FCurve cleanup in the Timeline

Philipp Oeser noreply at git.blender.org
Tue Dec 11 09:30:11 CET 2018


Commit: e4153946ad1e81c697b8d51d92a3e2f088d0af4d
Author: Philipp Oeser
Date:   Mon Dec 10 17:05:51 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe4153946ad1e81c697b8d51d92a3e2f088d0af4d

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

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

M	source/blender/editors/transform/transform_conversions.c

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

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*/);



More information about the Bf-blender-cvs mailing list