[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12019] branches/2-44-stable/blender/ source/blender/src/filesel.c: made relative disabled by default when the user has not saved their file, this made images not load in a new scene and another user reported problems with permissions when relative paths was enabled with an unsaved file .

[Campbell Barton]

Revision: 12019
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12019
Author:   campbellbarton
Date:     2007-09-12 05:51:26 +0200 (Wed, 12 Sep 2007)

Log Message:
-----------
made relative disabled by default when the user has not saved their file, this made images not load in a new scene and another user reported problems with permissions when relative paths was enabled with an unsaved file.

Modified Paths:
--------------
    branches/2-44-stable/blender/source/blender/src/filesel.c

Modified: branches/2-44-stable/blender/source/blender/src/filesel.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/filesel.c	2007-09-12 03:27:03 UTC (rev 12018)
+++ branches/2-44-stable/blender/source/blender/src/filesel.c	2007-09-12 03:51:26 UTC (rev 12019)
@@ -1358,8 +1358,10 @@
 	/* sfile->act is used for databrowse: double names of library objects */
 	sfile->act= -1;
 
-	if(BLI_convertstringcode(name, G.sce, G.scene->r.cfra)) sfile->flag |= FILE_STRINGCODE;
-	else sfile->flag &= ~FILE_STRINGCODE;
+	if(!strstr(G.main->name, ".B.blend") && BLI_convertstringcode(name, G.sce, G.scene->r.cfra))
+		sfile->flag |= FILE_STRINGCODE;
+	else
+		sfile->flag &= ~FILE_STRINGCODE;
 
 	if (U.uiflag & USER_HIDE_DOT)
 		sfile->flag |= FILE_HIDE_DOT;
@@ -1441,9 +1443,12 @@
 	simasel= curarea->spacedata.first;
 	simasel->returnfunc= func;
 
-	if(BLI_convertstringcode(name, G.sce, G.scene->r.cfra)) simasel->mode |= IMS_STRINGCODE;
-	else simasel->mode &= ~IMS_STRINGCODE;
 	
+	if(!strstr(G.main->name, ".B.blend") && BLI_convertstringcode(name, G.sce, G.scene->r.cfra))
+		simasel->mode |= IMS_STRINGCODE;
+	else
+		simasel->mode &= ~IMS_STRINGCODE;
+	
 	BLI_split_dirfile(name, dir, simasel->file);
 	BLI_cleanup_dir(G.sce, simasel->dir);
 	if(strcmp(dir, simasel->dir)!=0) simasel->fase= 0;