diff options
author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 12:59:44 +0300 |
---|---|---|
committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 12:59:44 +0300 |
commit | 8787ad14a256ab065c7c5fc24b56fd8c511847ba (patch) | |
tree | a9e48bd0921260a194093c64ea8a19a50cc80ed3 /source/blender/blenloader | |
parent | a68a7f42b02ad0260220d94f36ab61c772db071a (diff) | |
parent | ea460298bbb1322b990bf737fcd0f77fd535c097 (diff) |
update to trunk r14104
blenderbuttons is good
and it compiles
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 4567da932ee..1557e970306 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7789,7 +7789,12 @@ static void expand_doit(FileData *fd, Main *mainvar, void *old) ptr->curlib->parent= mainvar->curlib; } else { - //oldnewmap_insert(fd->libmap, bhead->old, id, 1); + /* The line below was commented by Ton (I assume), when Hos did the merge from the orange branch. rev 6568 + * This line is NEEDED, the case is that you have 3 blend files... + * user.blend, lib.blend and lib_indirect.blend - if user.blend alredy references a "tree" from + * lib_indirect.blend but lib.blend does too, linking in a Scene or Group from lib.blend can result in an + * empty without the dupli group referenced. Once you save and reload the group would appier. - Campbell */ + oldnewmap_insert(fd->libmap, bhead->old, id, 1); change_idid_adr_fd(fd, bhead->old, id); if(G.f & G_DEBUG) printf("expand_doit: already linked: %s lib: %s\n", id->name, lib->name); |