[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53892] trunk/blender/source/blender/ blenkernel/intern/seqeffects.c: Fix #33910: Wipe effect starts and stops to early with blur enabled.

[Sergey Sharybin]

Revision: 53892
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53892
Author:   nazgul
Date:     2013-01-18 09:36:17 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/seqeffects.c

Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2013-01-18 09:19:43 UTC (rev 53891)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2013-01-18 09:36:17 UTC (rev 53892)
@@ -1317,7 +1317,8 @@
 
 	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;