[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14892] trunk/blender/source/blender/src/ sequence.c: == Sequencer ==

[Peter Schlaile]

Revision: 14892
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14892
Author:   schlaile
Date:     2008-05-19 08:14:57 +0200 (Mon, 19 May 2008)

Log Message:
-----------
== Sequencer ==

This fixes:
[11750] "Translate" stops working when offset > image size

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2008-05-19 05:34:31 UTC (rev 14891)
+++ trunk/blender/source/blender/src/sequence.c	2008-05-19 06:14:57 UTC (rev 14892)
@@ -1452,6 +1452,7 @@
 	if(seq->flag & SEQ_USE_CROP || seq->flag & SEQ_USE_TRANSFORM) {
 		StripCrop c;
 		StripTransform t;
+		int sx,sy,dx,dy;
 
 		memset(&c, 0, sizeof(StripCrop));
 		memset(&t, 0, sizeof(StripTransform));
@@ -1463,23 +1464,23 @@
 			t = *seq->strip->transform;
 		}
 
+		sx = se->ibuf->x - c.left - c.right;
+		sy = se->ibuf->y - c.top - c.bottom;
+		dx = sx;
+		dy = sy;
+
+		if (seq->flag & SEQ_USE_TRANSFORM) {
+			dx = seqrectx;
+			dy = seqrecty;
+		}
+
 		if (c.top + c.bottom >= se->ibuf->y ||
 		    c.left + c.right >= se->ibuf->x ||
-		    t.xofs >= se->ibuf->x ||
-		    t.yofs >= se->ibuf->y) {
+		    t.xofs >= dx || t.yofs >= dy) {
 			make_black_ibuf(se->ibuf);
 		} else {
 			ImBuf * i;
-			int sx = se->ibuf->x - c.left - c.right;
-			int sy = se->ibuf->y - c.top - c.bottom;
-			int dx = sx;
-			int dy = sy;
 
-			if (seq->flag & SEQ_USE_TRANSFORM) {
-				dx = seqrectx;
-				dy = seqrecty;
-			}
-
 			if (se->ibuf->rect_float) {
 				i = IMB_allocImBuf(dx, dy,32, IB_rectfloat, 0);
 			} else {