[Bf-committers] Fix for #913 "inconsistent .B.blend loading/saving"

[Bill Baxter]

This is a multi-part message in MIME format.
--------------010805090504010700040604
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

I'm sure aphex can take care of this, but this patch is a really simple 
2-line fix for #913.

It looks like there's some greater plan at works to revamp the file 
structure on Windows, but it ain't working (and wasn't working in 
2.31a), so better to just comment it out for this feature freeze than to 
release another build with the prefs broken.

In the long term I question why you would *want* to make only Windows 
load and save things from ~/.blender?  If it's good for Windows why not 
do that for all platforms, and avoid adding all those ifdefs?

--bb

--------------010805090504010700040604
Content-Type: text/plain;
 name="patch_dirs.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch_dirs.txt"

Index: source/blender/src/usiblender.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/usiblender.c,v
retrieving revision 1.45
diff -c -r1.45 usiblender.c
*** source/blender/src/usiblender.c	23 Jan 2004 16:02:10 -0000	1.45
--- source/blender/src/usiblender.c	26 Jan 2004 05:10:10 -0000
***************
*** 420,426 ****
  	   To be removed at v2.4 or so! ;)
  	*/
  
! #ifdef WIN32
  	char dir[FILE_MAXDIR+FILE_MAXFILE];
  	BLI_getInstallationDir(dir);
  
--- 420,426 ----
  	   To be removed at v2.4 or so! ;)
  	*/
  
! #if 0
  	char dir[FILE_MAXDIR+FILE_MAXFILE];
  	BLI_getInstallationDir(dir);
  
Index: source/blender/blenloader/intern/writefile.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/blenloader/intern/writefile.c,v
retrieving revision 1.15
diff -c -r1.15 writefile.c
*** source/blender/blenloader/intern/writefile.c	7 Jan 2004 21:03:11 -0000	1.15
--- source/blender/blenloader/intern/writefile.c	26 Jan 2004 05:10:13 -0000
***************
*** 1608,1614 ****
  		return 0;
  	}
  	
! #ifdef WIN32
  	BLI_getInstallationDir(tmpdir);
  
  	if(BLI_exists(tmpdir))
--- 1608,1614 ----
  		return 0;
  	}
  	
! #if 0
  	BLI_getInstallationDir(tmpdir);
  
  	if(BLI_exists(tmpdir))

--------------010805090504010700040604--