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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-01-18 13:36:17 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-01-18 13:36:17 +0400
commit9660ba6c2b1093470d189947286adda483b8faff (patch)
tree4108cae51713117ee45156940019ff5cfee3d972 /source/blender/blenkernel/intern/seqeffects.c
parent55030a4c1a9e96a0d497b476abad70b05db761a2 (diff)
Fix #33910: Wipe effect starts and stops to early with blur enabled.
Made small tweaks which now limits blur width in a way it can not be wider than distance between frame boundary and wipe effect center. It eliminates weirdeness of how blur appears/disappears in cases effect fac is close to 0/1. Could be tweaked further but will require effect rewrite it seems.
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r--source/blender/blenkernel/intern/seqeffects.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index c64609c8e70..c0e85352217 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -1317,7 +1317,8 @@ static float check_zone(WipeZone *wipezone, int x, int y, Sequence *seq, float f
switch (wipe->wipetype) {
case DO_SINGLE_WIPE:
- width = wipezone->width;
+ width = min_ii(wipezone->width, facf0 * yo);
+ width = min_ii(width, yo - facf0 * yo);
if (angle == 0.0f) {
b1 = posy;