[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30188] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: [#22791] Can' t change keyed strip attributes if two sequencer windows open

[Campbell Barton]

Revision: 30188
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30188
Author:   campbellbarton
Date:     2010-07-10 21:17:52 +0200 (Sat, 10 Jul 2010)

Log Message:
-----------
[#22791] Can't change keyed strip attributes if two sequencer windows open
own recent commit for overlay sequencer view brokey keyframing in the sequencer.

for now prefetch and overlay views wont have correct fcurves applied.

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	2010-07-10 18:11:01 UTC (rev 30187)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-10 19:17:52 UTC (rev 30188)
@@ -2544,10 +2544,6 @@
 	int i;
 	TStripElem* se = 0;
 
-	// XXX for prefetch and overlay offset!..., very bad!!!
-	AnimData *adt= BKE_animdata_from_id(&scene->id);
-	BKE_animsys_evaluate_animdata(&scene->id, adt, cfra, ADT_RECALC_ANIM);
-
 	count = get_shown_sequences(seqbasep, cfra, chanshown, 
 					(Sequence **)&seq_arr);
 
@@ -2561,6 +2557,14 @@
 		return 0;
 	}
 
+#if 0 /* commentind since this breaks keyframing, since it resets the value on draw */
+	if(scene->r.cfra != cfra) {
+		// XXX for prefetch and overlay offset!..., very bad!!!
+		AnimData *adt= BKE_animdata_from_id(&scene->id);
+		BKE_animsys_evaluate_animdata(&scene->id, adt, cfra, ADT_RECALC_ANIM);
+	}
+#endif
+
 	test_and_auto_discard_ibuf(se, seqrectx, seqrecty);
 
 	if (se->ibuf_comp != 0) {