[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57274] trunk/blender/source/blender/ editors/space_file/filesel.c: change to r57261, replace BLI_cleanup_dir with BLI_split_dir_part

Campbell Barton ideasman42 at gmail.com
Fri Jun 7 01:58:31 CEST 2013


Revision: 57274
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57274
Author:   campbellbarton
Date:     2013-06-06 23:58:30 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
change to r57261, replace BLI_cleanup_dir with BLI_split_dir_part

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57261

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/filesel.c

Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c	2013-06-06 22:25:20 UTC (rev 57273)
+++ trunk/blender/source/blender/editors/space_file/filesel.c	2013-06-06 23:58:30 UTC (rev 57274)
@@ -254,8 +254,19 @@
 	/* initialize the list with previous folders */
 	if (!sfile->folders_prev)
 		sfile->folders_prev = folderlist_new();
-	if (!sfile->params->dir[0])
-		BLI_cleanup_dir(G.main->name, sfile->params->dir);
+
+	if (!sfile->params->dir[0]) {
+		if (G.main->name[0]) {
+			BLI_split_dir_part(G.main->name, sfile->params->dir, sizeof(sfile->params->dir));
+		}
+		else {
+			const char *doc_path = BLI_getDefaultDocumentFolder();
+			if (doc_path) {
+				BLI_strncpy(sfile->params->dir, doc_path, sizeof(sfile->params->dir));
+			}
+		}
+	}
+
 	folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
 
 	/* switching thumbnails needs to recalc layout [#28809] */




More information about the Bf-blender-cvs mailing list