[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57610] trunk/blender/source/blender: Sequencer: fix names when adding several video (or audio) files at once ( all strips were getting the same, annoying ; ) ).

Bastien Montagne montagne29 at wanadoo.fr
Thu Jun 20 15:52:59 CEST 2013


Revision: 57610
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57610
Author:   mont29
Date:     2013-06-20 13:52:58 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
Sequencer: fix names when adding several video (or audio) files at once (all strips were getting the same, annoying ;) ).

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

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-06-20 13:27:48 UTC (rev 57609)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-06-20 13:52:58 UTC (rev 57610)
@@ -4171,6 +4171,8 @@
 
 	BKE_sequence_calc_disp(scene, seq);
 
+	if (seq_load->name[0] == '\0')
+		BLI_strncpy(seq_load->name, se->name, sizeof(seq_load->name));
 
 	if (seq_load->flag & SEQ_LOAD_MOVIE_SOUND) {
 		int start_frame_back = seq_load->start_frame;
@@ -4182,9 +4184,6 @@
 		seq_load->channel--;
 	}
 
-	if (seq_load->name[0] == '\0')
-		BLI_strncpy(seq_load->name, se->name, sizeof(seq_load->name));
-
 	/* can be NULL */
 	seq_load_apply(scene, seq, seq_load);
 

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2013-06-20 13:27:48 UTC (rev 57609)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2013-06-20 13:52:58 UTC (rev 57610)
@@ -562,10 +562,14 @@
 			RNA_string_get(&itemptr, "name", file_only);
 			BLI_join_dirfile(seq_load.path, sizeof(seq_load.path), dir_only, file_only);
 
+			/* Set seq_load.name, else all video/audio files get the same name! ugly! */
+			BLI_strncpy(seq_load.name, file_only, sizeof(seq_load.name));
+
 			seq = seq_load_func(C, ed->seqbasep, &seq_load);
 			if (seq) {
 				if (overlap == FALSE) {
-					if (BKE_sequence_test_overlap(ed->seqbasep, seq)) BKE_sequence_base_shuffle(ed->seqbasep, seq, scene);
+					if (BKE_sequence_test_overlap(ed->seqbasep, seq))
+						BKE_sequence_base_shuffle(ed->seqbasep, seq, scene);
 				}
 			}
 		}




More information about the Bf-blender-cvs mailing list