blender
/
blender
133
398
Fork 579
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix (unreported) Append/link code: All library datablocks could end with same name. 

This was broken since ages I think, did not really hurt since we usually never use libs' names
to access them. Rather bad behavior however, breaking a ground rule of our ID system!

And no real reason to add new libraries to new (split) Main at all, libraries are
never considered linked datablocks, which means they should always be in 'main' Main->library list.

Not a regression, but should be included in 2.76 imho.
This commit is contained in:
Bastien Montagne 2015-09-21 15:01:55 +02:00 committed by Sergey Sharybin
parent c0384c4645
commit d16ee90b9c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/readfile.c
View File

@ -618,7 +618,9 @@ static Main *blo_find_main(FileData *fd, const char *filepath, const char *relab
m = BKE_main_new();
BLI_addtail(mainlist, m);
lib = BKE_libblock_alloc(m, ID_LI, "lib");
/* Add library datablock itself to 'main' Main, since libraries are **never** linked data.
* Fixes bug where you could end with all ID_LI datablocks having the same name... */
lib = BKE_libblock_alloc(mainlist->first, ID_LI, "Lib");
BLI_strncpy(lib->name, filepath, sizeof(lib->name));
BLI_strncpy(lib->filepath, name1, sizeof(lib->filepath));