[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28960] branches/render25/source/blender/ blenlib/intern/bpath.c: Render Branch: svn merge https://svn.blender.org/ svnroot/bf-blender/trunk/blender -r28957:28959

[Campbell Barton]

Revision: 28960
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28960
Author:   campbellbarton
Date:     2010-05-24 16:42:58 +0200 (Mon, 24 May 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28957:28959

Modified Paths:
--------------
    branches/render25/source/blender/blenlib/intern/bpath.c

Modified: branches/render25/source/blender/blenlib/intern/bpath.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/bpath.c	2010-05-24 14:41:35 UTC (rev 28959)
+++ branches/render25/source/blender/blenlib/intern/bpath.c	2010-05-24 14:42:58 UTC (rev 28960)
@@ -62,7 +62,7 @@
 /* for sequence */
 //XXX #include "BSE_sequence.h"
 //XXX define below from BSE_sequence.h - otherwise potentially odd behaviour
-#define SEQ_HAS_PATH(seq) (seq->type==SEQ_MOVIE || seq->type==SEQ_IMAGE)
+#define SEQ_HAS_PATH(_seq) ( (_seq)->type==SEQ_MOVIE || (_seq)->type==SEQ_IMAGE || (_seq)->type==SEQ_SOUND )
 
 
 
@@ -262,7 +262,7 @@
 	path[0] = '\0'; /* incase we cant get the path */
 	if (seq==NULL) return;
 	if (SEQ_HAS_PATH(seq)) {
-		if (seq->type == SEQ_IMAGE || seq->type == SEQ_MOVIE) {
+		if (ELEM3(seq->type, SEQ_IMAGE, SEQ_MOVIE, SEQ_SOUND)) {
 			BLI_strncpy(path, seq->strip->dir, FILE_MAX);
 			BLI_add_slash(path); /* incase its missing */
 			if (seq->strip->stripdata) { /* should always be true! */
@@ -281,7 +281,7 @@
 	if (seq==NULL) return; 
 	
 	if (SEQ_HAS_PATH(seq)) {
-		if (seq->type == SEQ_IMAGE || seq->type == SEQ_MOVIE) {
+		if (ELEM3(seq->type, SEQ_IMAGE, SEQ_MOVIE, SEQ_SOUND)) {
 			BLI_split_dirfile(path, seq->strip->dir, seq->strip->stripdata->name);
 		} else {
 			/* simple case */