[Bf-blender-cvs] [c0748c4] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: c0748c42921108180df4e016b88fc8052e9c928f
Author: Bastien Montagne
Date:   Sat Apr 4 10:50:17 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBc0748c42921108180df4e016b88fc8052e9c928f

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/blenlib/intern/storage.c
	source/blender/editors/space_file/filesel.c

===================================================================



===================================================================

diff --cc source/blender/editors/space_file/filesel.c
index b6256f5,6858f53..50f3379
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@@ -662,10 -642,11 +662,11 @@@ int file_select_match(struct SpaceFile 
  	 */
  	for (i = 0; i < n; i++) {
  		file = filelist_file(sfile->files, i);
- 		if (!(file->typeflag & FILE_TYPE_DIR) && (fnmatch(pattern, file->relpath, 0) == 0)) {
+ 		/* Do not check wether file is a file or dir here! Causes T44243 (we do accept dirs at this stage). */
 -		if (fnmatch(pattern, file->relname, 0) == 0) {
++		if (fnmatch(pattern, file->relpath, 0) == 0) {
  			file->selflag |= FILE_SEL_SELECTED;
  			if (!match) {
 -				BLI_strncpy(matched_file, file->relname, FILE_MAX);
 +				BLI_strncpy(matched_file, file->relpath, FILE_MAX);
  			}
  			match++;
  		}