[Bf-blender-cvs] [ba2b26af31c] master: Support proportional edit scaling on dopesheet keyframes

[Philipp Oeser]

Commit: ba2b26af31ca7e1a8d547cf308be2c1afbe7a4f5
Author: Philipp Oeser
Date:   Thu Jan 10 14:03:52 2019 +0100
Branches: master
https://developer.blender.org/rBba2b26af31ca7e1a8d547cf308be2c1afbe7a4f5

Support proportional edit scaling on dopesheet keyframes

Fixes T60361

Reviewers: brecht

Maniphest Tasks: T60361

Differential Revision: https://developer.blender.org/D4188

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

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

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 2b2de65db15..055e9744043 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -9181,6 +9181,9 @@ static void applyTimeScaleValue(TransInfo *t)
 				fac = floorf(fac + 0.5f);
 			}
 
+			/* take proportional editing into account */
+			fac = ((fac - 1.0f) * td->factor) + 1;
+
 			/* check if any need to apply nla-mapping */
 			if (adt)
 				startx = BKE_nla_tweakedit_remap(adt, startx, NLATIME_CONVERT_UNMAP);