[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36734] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: This fixes:

[Peter Schlaile]

Revision: 36734
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36734
Author:   schlaile
Date:     2011-05-17 18:37:44 +0000 (Tue, 17 May 2011)
Log Message:
-----------
This fixes:
[#27422] Strobe setting does not work with effect strip
[#27421] Some Settings of Adjustment Layers are not Functional.

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

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2011-05-17 16:21:06 UTC (rev 36733)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2011-05-17 18:37:44 UTC (rev 36734)
@@ -977,16 +977,22 @@
 	int sta = seq->start;
 	int end = seq->start+seq->len-1;
 
-	if(seq->len == 0) return -1;
+	if (seq->type & SEQ_EFFECT) {
+		end = seq->enddisp;
+	} 
 
+	if(end < sta) {
+		return -1;
+	}
+
 	if(seq->flag&SEQ_REVERSE_FRAMES) {	
 		/*reverse frame in this sequence */
-		if(cfra <= sta) nr= seq->len-1;
+		if(cfra <= sta) nr= end - sta;
 		else if(cfra >= end) nr= 0;
 		else nr= end - cfra;
 	} else {
 		if(cfra <= sta) nr= 0;
-		else if(cfra >= end) nr= seq->len-1;
+		else if(cfra >= end) nr= end - sta;
 		else nr= cfra - sta;
 	}
 	
@@ -2036,8 +2042,9 @@
 			break;
 		}
 		case SEQ_EFFECT:
-		{	
-			ibuf = seq_render_effect_strip_impl(context, seq, cfra);
+		{
+			ibuf = seq_render_effect_strip_impl(
+				context, seq, seq->start + nr);
 			break;
 		}
 		case SEQ_IMAGE: