diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
| commit | 871b7ba8922650c34b487fec29a9d677b1aeadfd (patch) | |
| tree | a13c8635e43919aed3ad48afe096f6501bbeb9a2 /source/blender/blenkernel/intern/seqeffects.c | |
| parent | 55263c8a4c03c1add138e5191f98a8b68591289f (diff) | |
| parent | 9fd0060c0f3458e53b38003d1388f16cb56f45d8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 9105961a3ae..65d023fb6f2 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1772,8 +1772,9 @@ static float check_zone(WipeZone *wipezone, int x, int y, Sequence *seq, float f /* BOX WIPE IS NOT WORKING YET */ #if 0 case DO_BOX_WIPE: - if (!wipe->forward) + if (!wipe->forward) { facf0 = 1.0f - facf0; /* Go the other direction */ + } width = (int)(wipe->edgeWidth * ((xo + yo) / 2.0)); hwidth = (float)width / 2.0; |