[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14849] trunk/blender/source/blender/src/ filesel.c: changing between libraries with the append/ link library selector didnt re-read a new blend file when it alredy had one loaded .
Campbell Barton
ideasman42 at gmail.com
Thu May 15 15:18:57 CEST 2008
Revision: 14849
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14849
Author: campbellbarton
Date: 2008-05-15 15:18:56 +0200 (Thu, 15 May 2008)
Log Message:
-----------
changing between libraries with the append/link library selector didnt re-read a new blend file when it alredy had one loaded.
it looks like this only ever worked for the first library selected.
Modified Paths:
--------------
trunk/blender/source/blender/src/filesel.c
Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c 2008-05-15 08:05:56 UTC (rev 14848)
+++ trunk/blender/source/blender/src/filesel.c 2008-05-15 13:18:56 UTC (rev 14849)
@@ -1588,8 +1588,7 @@
BLI_strncpy(sfile->dir, butname, sizeof(sfile->dir));
/* strip the trailing slash if its a real dir */
- if (strlen(butname)!=1)
- butname[strlen(butname)-1]=0;
+ BLI_del_slash(butname);
if(sfile->type & FILE_UNIX) {
if (!BLI_exists(butname)) {
@@ -1633,6 +1632,11 @@
BLI_strncpy(sfile->dir, lib->filename, sizeof(sfile->dir));
BLI_make_exist(sfile->dir);
BLI_cleanup_dir(G.sce, sfile->dir);
+
+ /* forced re-reading the blend file */
+ if(sfile->libfiledata) BLO_blendhandle_close(sfile->libfiledata);
+ sfile->libfiledata= 0;
+
freefilelist(sfile);
sfile->ofs= 0;
scrarea_queue_winredraw(curarea);
More information about the Bf-blender-cvs
mailing list