[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14750] trunk/blender/source/blender/src/ sequence.c: fix for [#10581] 2. 46 RC3 Sequence editor on OSX renders PNG files as black/empty

[Campbell Barton]

Revision: 14750
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14750
Author:   campbellbarton
Date:     2008-05-08 22:10:50 +0200 (Thu, 08 May 2008)

Log Message:
-----------
fix for [#10581] 2.46 RC3 Sequence editor on OSX renders PNG files as 
black/empty
use BLI_join_dirfile which makes sure the slashes are there.

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

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c 2008-05-08 19:57:10 UTC (rev 
14749)
+++ trunk/blender/source/blender/src/sequence.c 2008-05-08 20:10:50 UTC (rev 
14750)
@@ -426,11 +426,9 @@
 
        if (seq->type != SEQ_SCENE && seq->type != SEQ_META &&
            seq->type != SEQ_IMAGE) {
-               strncpy(str, seq->strip->dir, FILE_MAXDIR-1);
-               strncat(str, seq->strip->stripdata->name, FILE_MAXFILE-1);
-
+               BLI_join_dirfile(str, seq->strip->dir, 
seq->strip->stripdata->name);
                BLI_convertstringcode(str, G.sce);
-               BLI_convertstringframe(str, G.scene->r.cfra); /* TODO - is this 
needed? */
+               BLI_convertstringframe(str, G.scene->r.cfra);
                
        }
 
@@ -1707,9 +1705,7 @@
        } else if(seq->type == SEQ_IMAGE) {
                if(se->ok == STRIPELEM_OK && se->ibuf == 0) {
                        StripElem * s_elem = give_stripelem(seq, cfra);
-                       
-                       strncpy(name, seq->strip->dir, FILE_MAXDIR-1);
-                       strncat(name, s_elem->name, FILE_MAXFILE-1);
+                       BLI_join_dirfile(name, seq->strip->dir, s_elem->name);
                        BLI_convertstringcode(name, G.sce);
                        BLI_convertstringframe(name, G.scene->r.cfra);
                        if (!build_proxy_run) {
@@ -1738,8 +1734,7 @@
 
                        if (se->ibuf == 0) {
                                if(seq->anim==0) {
-                                       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);
                                        BLI_convertstringframe(name, 
G.scene->r.cfra);
                                


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs