[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50449] trunk/blender/source/blender: make freeing sequencer strip without cache an option only exposed within sequencer .c

[Campbell Barton]

Revision: 50449
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50449
Author:   campbellbarton
Date:     2012-09-06 09:23:38 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
make freeing sequencer strip without cache an option only exposed within sequencer.c

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/makesrna/intern/rna_sequencer_api.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2012-09-06 07:44:49 UTC (rev 50448)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2012-09-06 09:23:38 UTC (rev 50449)
@@ -199,7 +199,7 @@
 
 void BKE_sequencer_free_clipboard(void);
 
-void BKE_sequence_free(struct Scene *scene, struct Sequence *seq, const int do_cache);
+void BKE_sequence_free(struct Scene *scene, struct Sequence *seq);
 const char *BKE_sequence_give_name(struct Sequence *seq);
 void BKE_sequence_calc(struct Scene *scene, struct Sequence *seq);
 void BKE_sequence_calc_disp(struct Scene *scene, struct Sequence *seq);

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-06 07:44:49 UTC (rev 50448)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-06 09:23:38 UTC (rev 50449)
@@ -169,7 +169,8 @@
 	MEM_freeN(strip);
 }
 
-void BKE_sequence_free(Scene *scene, Sequence *seq, const int do_cache)
+/* only give option to skip cache locally (static func) */
+static void BKE_sequence_free_ex(Scene *scene, Sequence *seq, const int do_cache)
 {
 	if (seq->strip)
 		seq_free_strip(seq->strip);
@@ -219,6 +220,11 @@
 	MEM_freeN(seq);
 }
 
+void BKE_sequence_free(Scene *scene, Sequence *seq)
+{
+	BKE_sequence_free_ex(scene, seq, TRUE);
+}
+
 /* cache must be freed before calling this function
  * since it leaves the seqbase in an invalid state */
 static void seq_free_sequence_recurse(Scene *scene, Sequence *seq)
@@ -230,7 +236,7 @@
 		seq_free_sequence_recurse(scene, iseq);
 	}
 
-	BKE_sequence_free(scene, seq, FALSE);
+	BKE_sequence_free_ex(scene, seq, FALSE);
 }
 
 
@@ -251,7 +257,7 @@
 		seq_free_clipboard_recursive(seq);
 	}
 
-	BKE_sequence_free(NULL, seq_parent, FALSE);
+	BKE_sequence_free_ex(NULL, seq_parent, FALSE);
 }
 
 void BKE_sequencer_free_clipboard(void)
@@ -290,7 +296,8 @@
 
 	SEQ_BEGIN (ed, seq)
 	{
-		BKE_sequence_free(scene, seq, FALSE);
+		/* handle cache freeing above */
+		BKE_sequence_free_ex(scene, seq, FALSE);
 	}
 	SEQ_END
 

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-09-06 07:44:49 UTC (rev 50448)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-09-06 09:23:38 UTC (rev 50449)
@@ -613,7 +613,7 @@
 			BLI_remlink(lb, seq);
 			if (seq == last_seq) BKE_sequencer_active_set(scene, NULL);
 			if (seq->type == SEQ_TYPE_META) recurs_del_seq_flag(scene, &seq->seqbase, flag, 1);
-			BKE_sequence_free(scene, seq, TRUE);
+			BKE_sequence_free(scene, seq);
 		}
 		seq = seqn;
 	}
@@ -1812,7 +1812,7 @@
 				start_ofs += step;
 			}
 
-			BKE_sequence_free(scene, seq, TRUE);
+			BKE_sequence_free(scene, seq);
 			seq = seq->next;
 		}
 		else {
@@ -2010,7 +2010,7 @@
 	last_seq->seqbase.last = NULL;
 
 	BLI_remlink(ed->seqbasep, last_seq);
-	BKE_sequence_free(scene, last_seq, TRUE);
+	BKE_sequence_free(scene, last_seq);
 
 	/* emtpy meta strip, delete all effects depending on it */
 	for (seq = ed->seqbasep->first; seq; seq = seq->next)

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c	2012-09-06 07:44:49 UTC (rev 50448)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c	2012-09-06 09:23:38 UTC (rev 50449)
@@ -170,7 +170,7 @@
 	if (seq->strip->stripdata->name[0] == '\0') {
 		BKE_report(reports, RPT_ERROR, "Sequences.new_image: unable to open image file");
 		BLI_remlink(&ed->seqbase, seq);
-		BKE_sequence_free(scene, seq, FALSE);  /* cache won't have been generated */
+		BKE_sequence_free(scene, seq);
 		return NULL;
 	}
 
@@ -315,7 +315,7 @@
 	Scene *scene = (Scene *)id;
 
 	BLI_remlink(&ed->seqbase, seq);
-	BKE_sequence_free(scene, seq, TRUE);
+	BKE_sequence_free(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 }