[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59388] branches/asset-browser/source/ blender/editors/space_file: == filebroser ==

[Andrea Weikert]

Revision: 59388
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59388
Author:   elubie
Date:     2013-08-22 18:10:53 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
== filebroser ==

Fix path for experimental DataBrowse. Now at least the browsing should work.

Modified Paths:
--------------
    branches/asset-browser/source/blender/editors/space_file/file_ops.c
    branches/asset-browser/source/blender/editors/space_file/filelist.c

Modified: branches/asset-browser/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/asset-browser/source/blender/editors/space_file/file_ops.c	2013-08-22 18:02:36 UTC (rev 59387)
+++ branches/asset-browser/source/blender/editors/space_file/file_ops.c	2013-08-22 18:10:53 UTC (rev 59388)
@@ -156,6 +156,8 @@
 {
 	FileSelect retval = FILE_SELECT_NOTHING;
 	SpaceFile *sfile = CTX_wm_space_file(C);
+	Main *bmain = CTX_data_main(C);
+
 	FileSelectParams *params = ED_fileselect_get_params(sfile);
 	int numfiles = filelist_numfiles(sfile->files);
 	struct direntry *file;
@@ -165,7 +167,7 @@
 	    (selected_idx < numfiles) &&
 	    (file = filelist_file(sfile->files, selected_idx)))
 	{
-		params->active_file = selected_idx;
+		params->active_file = selected_idx;		
 
 		if (S_ISDIR(file->type)) {
 			if (do_diropen == FALSE) {
@@ -182,7 +184,10 @@
 					BLI_parent_dir(params->dir);
 				}
 				else {
-					BLI_cleanup_dir(G.main->name, params->dir);
+					/* XXX_ELUBIE HACK: for now don't cleanup the path, is supposed to be empty for internal .blend */
+					if (params->type != FILE_MAIN) {
+						BLI_cleanup_dir(G.main->name, params->dir);
+					}					
 					strcat(params->dir, file->relname);
 					BLI_add_slash(params->dir);
 				}

Modified: branches/asset-browser/source/blender/editors/space_file/filelist.c
===================================================================
--- branches/asset-browser/source/blender/editors/space_file/filelist.c	2013-08-22 18:02:36 UTC (rev 59387)
+++ branches/asset-browser/source/blender/editors/space_file/filelist.c	2013-08-22 18:10:53 UTC (rev 59388)
@@ -1153,9 +1153,9 @@
 		
 		/* make directories */
 #ifdef WITH_FREESTYLE
-		filelist->numfiles = 24;
+		filelist->numfiles = 27;
 #else
-		filelist->numfiles = 23;
+		filelist->numfiles = 26;
 #endif
 		filelist->filelist = (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry));
 		
@@ -1173,7 +1173,7 @@
 		filelist->filelist[6].relname = BLI_strdup("Material");
 		filelist->filelist[7].relname = BLI_strdup("Texture");
 		filelist->filelist[8].relname = BLI_strdup("Image");
-		filelist->filelist[9].relname = BLI_strdup("Ika");
+		filelist->filelist[9].relname = BLI_strdup("Brush");
 		filelist->filelist[10].relname = BLI_strdup("Wave");
 		filelist->filelist[11].relname = BLI_strdup("Lattice");
 		filelist->filelist[12].relname = BLI_strdup("Lamp");
@@ -1187,8 +1187,11 @@
 		filelist->filelist[20].relname = BLI_strdup("Action");
 		filelist->filelist[21].relname = BLI_strdup("NodeTree");
 		filelist->filelist[22].relname = BLI_strdup("Speaker");
+		filelist->filelist[23].relname = BLI_strdup("MovieClip");
+		filelist->filelist[24].relname = BLI_strdup("Mask");
+		filelist->filelist[25].relname = BLI_strdup("AssetCollection");
 #ifdef WITH_FREESTYLE
-		filelist->filelist[23].relname = BLI_strdup("FreestyleLineStyle");
+		filelist->filelist[26].relname = BLI_strdup("FreestyleLineStyle");
 #endif
 		filelist_sort(filelist, FILE_SORT_ALPHA);
 	}