Commit: 126e1aa60a8afd9f9eae531c5a1aff02c11ae5b4
Author: Bastien Montagne
Date: Thu Apr 9 12:05:09 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB126e1aa60a8afd9f9eae531c5a1aff02c11ae5b4
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/blenlib/intern/BLI_filelist.c
source/blender/editors/space_file/filelist.c
===================================================================
===================================================================
diff --cc source/blender/blenlib/intern/BLI_filelist.c
index 7e409c8,b934b51..a450fee
--- a/source/blender/blenlib/intern/BLI_filelist.c
+++ b/source/blender/blenlib/intern/BLI_filelist.c
@@@ -148,6 -178,11 +178,10 @@@ static void bli_builddir(struct BuildDi
if (BLI_stat(fullname, &file->s) != -1)
{
file->type = file->s.st_mode;
}
+ else if
(FILENAME_IS_CURRPAR(file->relname)) {
+ /* Hack around for UNC paths on
windows - does not support stat on '\\SERVER\foo\..', sigh... */
+ file->type |= S_IFDIR;
+ }
- file->flags = 0;
dir_ctx->nrfiles++;
file++;
dlink = dlink->next;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
