Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-01-10 16:03:52 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-01-10 18:07:47 +0300
commitba2b26af31ca7e1a8d547cf308be2c1afbe7a4f5 (patch)
tree0f8fa5efec29637c33661b51dd09208882db958b /source/blender/editors/transform
parent92a081ff83ba551dd061f233af6239e1dbfb1241 (diff)
Support proportional edit scaling on dopesheet keyframes
Fixes T60361 Reviewers: brecht Maniphest Tasks: T60361 Differential Revision: https://developer.blender.org/D4188
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform.c3
1 files changed, 3 insertions, 0 deletions
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);