[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17350] trunk/blender/source/blender/src/ seqaudio.c: Bugfix #17524

Diego Borghetti bdiego at gmail.com
Thu Nov 6 19:49:54 CET 2008


Revision: 17350
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17350
Author:   bdiego
Date:     2008-11-06 19:49:53 +0100 (Thu, 06 Nov 2008)

Log Message:
-----------
Bugfix #17524

 The problem is that the audio_fill_seq function try to load the hd file
if the sequence don't have it, but it join the two string (directory path +
file path) without the / (Linux... \ Windows), so the result is a wrong path.

 I change the the strncpy and strncat function for a BLI_join_dirfile (like
the reload_sequence_new_file) and all work fine now.

 Also note that the "them go" that Luca report is (or what happen here) the
ctrl+z function, and now both case work fine here.

(interesting.. date from Feb 05.. 2006 ;)

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

Modified: trunk/blender/source/blender/src/seqaudio.c
===================================================================
--- trunk/blender/source/blender/src/seqaudio.c	2008-11-06 16:01:17 UTC (rev 17349)
+++ trunk/blender/source/blender/src/seqaudio.c	2008-11-06 18:49:53 UTC (rev 17350)
@@ -398,11 +398,7 @@
 				if (!seq->hdaudio) {
 					char name[FILE_MAXDIR+FILE_MAXFILE];
 
-					strncpy(name, seq->strip->dir, 
-						FILE_MAXDIR-1);
-					strncat(name, 
-						seq->strip->stripdata->name, 
-						FILE_MAXFILE-1);
+					BLI_join_dirfile(name, seq->strip->dir, seq->strip->stripdata->name);
 					BLI_convertstringcode(name, G.sce);
 				
 					seq->hdaudio= sound_open_hdaudio(name);





More information about the Bf-blender-cvs mailing list