[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50572] trunk/blender/source/blender: Sequencer: add missed cache invalidation

[Sergey Sharybin]

Revision: 50572
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50572
Author:   nazgul
Date:     2012-09-13 10:51:18 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Sequencer: add missed cache invalidation

Invalidation was missed for:

- Strip (Un)Muting
- Changing speed effect
- Strip translating

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_sequencer.h
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2012-09-13 10:51:13 UTC (rev 50571)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2012-09-13 10:51:18 UTC (rev 50572)
@@ -297,6 +297,7 @@
 
 int BKE_sequence_check_depend(struct Sequence *seq, struct Sequence *cur);
 void BKE_sequence_invalidate_cache(struct Scene *scene, struct Sequence *seq);
+void BKE_sequence_invalidate_deendent(struct Scene *scene, struct Sequence *seq);
 void BKE_sequence_invalidate_cache_for_modifier(struct Scene *scene, struct Sequence *seq);
 
 void BKE_sequencer_update_sound_bounds_all(struct Scene *scene);

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-13 10:51:13 UTC (rev 50571)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-13 10:51:18 UTC (rev 50572)
@@ -2948,14 +2948,19 @@
 	return TRUE;
 }
 
-static void sequence_invalidate_cache(Scene *scene, Sequence *seq, int invalidate_preprocess)
+static void sequence_invalidate_cache(Scene *scene, Sequence *seq, int invalidate_self, int invalidate_preprocess)
 {
 	Editing *ed = scene->ed;
 	Sequence *cur;
 
 	/* invalidate cache for current sequence */
-	BKE_sequencer_cache_cleanup_sequence(seq);
+	if (invalidate_self)
+		BKE_sequencer_cache_cleanup_sequence(seq);
 
+	/* if invalidation is invoked from sequence free routine, effectdata would be NULL here */
+	if (seq->effectdata && seq->type == SEQ_TYPE_SPEED)
+		BKE_sequence_effect_speed_rebuild_map(scene, seq, TRUE);
+
 	if (invalidate_preprocess)
 		BKE_sequencer_preprocessed_cache_cleanup_sequence(seq);
 
@@ -2975,12 +2980,17 @@
 
 void BKE_sequence_invalidate_cache(Scene *scene, Sequence *seq)
 {
-	sequence_invalidate_cache(scene, seq, TRUE);
+	sequence_invalidate_cache(scene, seq, TRUE, TRUE);
 }
 
+void BKE_sequence_invalidate_deendent(Scene *scene, Sequence *seq)
+{
+	sequence_invalidate_cache(scene, seq, FALSE, TRUE);
+}
+
 void BKE_sequence_invalidate_cache_for_modifier(Scene *scene, Sequence *seq)
 {
-	sequence_invalidate_cache(scene, seq, FALSE);
+	sequence_invalidate_cache(scene, seq, TRUE, FALSE);
 }
 
 void BKE_sequencer_free_imbuf(Scene *scene, ListBase *seqbase, int check_mem_usage, int keep_file_handles)

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-09-13 10:51:13 UTC (rev 50571)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-09-13 10:51:18 UTC (rev 50572)
@@ -1141,12 +1141,16 @@
 	for (seq = ed->seqbasep->first; seq; seq = seq->next) {
 		if ((seq->flag & SEQ_LOCK) == 0) {
 			if (selected) { /* mute unselected */
-				if (seq->flag & SELECT)
+				if (seq->flag & SELECT) {
 					seq->flag |= SEQ_MUTE;
+					BKE_sequence_invalidate_deendent(scene, seq);
+				}
 			}
 			else {
-				if ((seq->flag & SELECT) == 0)
+				if ((seq->flag & SELECT) == 0) {
 					seq->flag |= SEQ_MUTE;
+					BKE_sequence_invalidate_deendent(scene, seq);
+				}
 			}
 		}
 	}
@@ -1188,12 +1192,16 @@
 	for (seq = ed->seqbasep->first; seq; seq = seq->next) {
 		if ((seq->flag & SEQ_LOCK) == 0) {
 			if (selected) { /* unmute unselected */
-				if (seq->flag & SELECT)
+				if (seq->flag & SELECT) {
 					seq->flag &= ~SEQ_MUTE;
+					BKE_sequence_invalidate_deendent(scene, seq);
+				}
 			}
 			else {
-				if ((seq->flag & SELECT) == 0)
+				if ((seq->flag & SELECT) == 0) {
 					seq->flag &= ~SEQ_MUTE;
+					BKE_sequence_invalidate_deendent(scene, seq);
+				}
 			}
 		}
 	}

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2012-09-13 10:51:13 UTC (rev 50571)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2012-09-13 10:51:18 UTC (rev 50572)
@@ -900,7 +900,9 @@
 
 	SEQ_BEGIN(ed, seq)
 	{
-		BKE_sequencer_cache_cleanup_sequence(seq);
+		if (seq->flag & SELECT) {
+			BKE_sequence_invalidate_deendent(t->scene, seq);
+		}
 	}
 	SEQ_END