diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
| commit | 8901263b5f04152a9c6a897c5115acd51be11bf1 (patch) | |
| tree | 14629685150a04440e2629fd45bd90891b8767ed /source/blender/blenkernel/intern/tracking_stabilize.c | |
| parent | f64df0e1024c2447ad449d0bf63def871ee47925 (diff) | |
| parent | 714e85b5344db7d9c9c7ac0a91cd0bb574c35353 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/tracking_stabilize.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking_stabilize.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index 36b24fbb2dc..722fc89a75f 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -1167,7 +1167,8 @@ static void stabilization_calculate_data(StabContext *ctx, if (ctx->stab->flag & TRACKING_STABILIZE_SCALE) { *r_scale = expf(scale_step * scaleinf); /* Averaged in log scale */ - } else { + } + else { *r_scale = 1.0f; } @@ -1180,8 +1181,8 @@ static void stabilization_calculate_data(StabContext *ctx, */ get_animated_target_pos(ctx, framenr, target_pos); sub_v2_v2(r_translation, target_pos); - *r_angle -= get_animated_target_rot(ctx,framenr); - target_scale = get_animated_target_scale(ctx,framenr); + *r_angle -= get_animated_target_rot(ctx, framenr); + target_scale = get_animated_target_scale(ctx, framenr); if (target_scale != 0.0f) { *r_scale /= target_scale; /* target_scale is an expected/intended reference zoom value */ |