griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

minor improvement - entering "//somepath" in the file selector didnt expand from the current blend files path.

Browse Source 
also quiet warning.
This commit is contained in:
Campbell Barton
2012-05-17 10:07:29 +00:00
parent dfa075b662
commit c406ce2974
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/readfile.c
View File

@@ -8995,7 +8995,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
/* 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);

6
source/blender/editors/space_file/file_ops.c
View File

@@ -1099,7 +1099,11 @@ static void file_expand_directory(bContext *C)
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);

2
source/blender/makesrna/intern/rna_sequencer_api.c
View File

@@ -202,7 +202,7 @@ static Sequence *rna_Sequences_new_sound(ID *id, Editing *ed, Main *bmain, Repor
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);