[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46717] trunk/blender/source/blender: minor improvement - entering "//somepath" in the file selector didnt expand from the current blend files path.

[Campbell Barton]

Revision: 46717
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46717
Author:   campbellbarton
Date:     2012-05-17 10:07:29 +0000 (Thu, 17 May 2012)
Log Message:
-----------
minor improvement - entering "//somepath" in the file selector didnt expand 
from the current blend files path.
also quiet warning.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/space_file/file_ops.c
    trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2012-05-17 
09:47:11 UTC (rev 46716)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2012-05-17 
10:07:29 UTC (rev 46717)
@@ -8995,7 +8995,7 @@
 
                                        /* printf and reports for now... its 
important users know this */
                                        BKE_reportf_wrap(basefd->reports, 
RPT_INFO,
-                                                        "read library:  '%s', 
'%s'\n",
+                                                        "read library:  '%s', 
'%s'",
                                                         
mainptr->curlib->filepath, mainptr->curlib->name);
 
                                        fd= 
blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);

Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c  2012-05-17 
09:47:11 UTC (rev 46716)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c  2012-05-17 
10:07:29 UTC (rev 46717)
@@ -1099,7 +1099,11 @@
        SpaceFile *sfile= CTX_wm_space_file(C);
        
        if (sfile->params) {
-               if ( sfile->params->dir[0] == '~' ) {
+               /* TODO, what about // when relbase isn't valid? */
+               if (G.relbase_valid && strncmp(sfile->params->dir, "//", 2) == 
0) {
+                       BLI_path_abs(sfile->params->dir, G.main->name);
+               }
+               else if (sfile->params->dir[0] == '~') {
                        char tmpstr[sizeof(sfile->params->dir)-1];
                        BLI_strncpy(tmpstr, sfile->params->dir+1, 
sizeof(tmpstr));
                        BLI_join_dirfile(sfile->params->dir, 
sizeof(sfile->params->dir), BLI_getDefaultDocumentFolder(), tmpstr);

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c    
2012-05-17 09:47:11 UTC (rev 46716)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c    
2012-05-17 10:07:29 UTC (rev 46717)
@@ -202,7 +202,7 @@
 
        seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_SOUND, 
sound->name);
        seq->sound = sound;
-       seq->len = ceil(sound_get_length(sound) * FPS);
+       seq->len = ceil((double)sound_get_length(sound) * FPS);
 
        seq->scene_sound = sound_add_scene_sound(scene, seq, start_frame, 
start_frame + seq->len, 0);
 

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