kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#27616] Appending an object from a file brings all existing group links to scene

Browse Source 
When appending from a blend file which had an object already linked, _but_ was not in any scenes.
- the linked object would be instanced.
This commit is contained in:
Campbell Barton 2011-06-09 04:28:53 +00:00
parent 912db4cdb5
commit 252f7c9af8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12742,8 +12742,14 @@ static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, const
/* when appending, make sure any indirectly loaded objects /* when appending, make sure any indirectly loaded objects
* get a base else they cant be accessed at all [#27437] */ * get a base else they cant be accessed at all [#27437] */
if(ob->id.us==1 && is_link==FALSE && ob->id.lib==lib) { if(ob->id.us==1 && is_link==FALSE && ob->id.lib==lib) {
if(object_in_any_scene(mainvar, ob)==0) {
do_it= 1; /* we may be appending from a scene where we already
* have a linked object which is not in any scene [#27616] */
if((ob->id.flag & LIB_PRE_EXISTING)==0) {
if(object_in_any_scene(mainvar, ob)==0) {
do_it= 1;
}
} }
} }
} }