diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 13:37:53 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 13:37:53 +0300 |
commit | a4842eb8db7eae6da1da3a95f9c66c9530921fe3 (patch) | |
tree | 7f845d6fa6c22d5e19607a8691b9763bc35f004e /source/blender/editors/transform/transform.c | |
parent | 7c9b5523ff4c4f392d495d06eb9b8a0b2ca5da3f (diff) | |
parent | 67a60504990a6203304527a8bdb3a09041ca28d0 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r-- | source/blender/editors/transform/transform.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 62a61a3a05a..7f1458def70 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -8777,9 +8777,10 @@ static void applyTimeTranslateValue(TransInfo *t, float value) /* It doesn't matter whether we apply to t->data or * t->data2d, but t->data2d is more convenient. */ for (i = 0; i < tc->data_len; i++, td++, td2d++) { - /* it is assumed that td->extra is a pointer to the AnimData, - * whose active action is where this keyframe comes from + /* It is assumed that td->extra is a pointer to the AnimData, + * whose active action is where this keyframe comes from. * (this is only valid when not in NLA) + * (also: masks and gpencil dont have animadata) */ AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL; @@ -8810,7 +8811,7 @@ static void applyTimeTranslateValue(TransInfo *t, float value) val = floorf(val + 0.5f); } - *(td->val) = td->ival + val; + *(td->val) = td->ival + val * td->factor; } /* apply nearest snapping */ |