[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15438] trunk/blender/source/blender/src/ editseq.c: patch [#17275] Fix for: pressing delete on an empty sequencer pops up a confirmation

Campbell Barton ideasman42 at gmail.com
Sat Jul 5 13:09:17 CEST 2008


Revision: 15438
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15438
Author:   campbellbarton
Date:     2008-07-05 13:08:39 +0200 (Sat, 05 Jul 2008)

Log Message:
-----------
patch [#17275] Fix for: pressing delete on an empty sequencer pops up a confirmation
from Roelf De Kock (kiemdoder) to address report #15025

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

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c	2008-07-05 08:50:41 UTC (rev 15437)
+++ trunk/blender/source/blender/src/editseq.c	2008-07-05 11:08:39 UTC (rev 15438)
@@ -2135,12 +2135,25 @@
 	Sequence *seq;
 	MetaStack *ms;
 	Editing *ed;
+	int nothingSelected = TRUE;
 
-	if(okee("Erase selected")==0) return;
-
 	ed= G.scene->ed;
 	if(ed==0) return;
 
+	seq=get_last_seq();
+	if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */
+		nothingSelected = FALSE;
+	} else {
+		for (seq = ed->seqbasep->first; seq; seq = seq->next) {
+			if (seq->flag & SELECT) {
+				nothingSelected = FALSE;
+				break;
+			}
+		}
+	}
+	
+	if(nothingSelected || okee("Erase selected")==0) return;
+
 	/* free imbufs of all dependent strips */
 	for(seq=ed->seqbasep->first; seq; seq=seq->next)
 		if(seq->flag & SELECT)





More information about the Bf-blender-cvs mailing list