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

Bug fix #34726

Browse Source 
Appending a group (which adds all object members to scene), didn't follow the
setting "In active layer".

One note: only the scene layers are copied over, not local view3d layers.
This commit is contained in:
Ton Roosendaal 2013-03-22 11:14:04 +00:00
parent 70319509ba
commit 5fb95d5567
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10291,7 +10291,7 @@ static int object_in_any_scene(Main *mainvar, Object *ob)
return 0; return 0;
} }
static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, const short idcode, const short is_link) static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, const short idcode, const short is_link, const short active_lay)
{ {
Object *ob; Object *ob;
Base *base; Base *base;
@ -10335,6 +10335,9 @@ static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, const
if (do_it) { if (do_it) {
base = MEM_callocN(sizeof(Base), "add_ext_base"); base = MEM_callocN(sizeof(Base), "add_ext_base");
BLI_addtail(&sce->base, base); BLI_addtail(&sce->base, base);
if (active_lay) ob->lay = sce->lay;
base->lay = ob->lay; base->lay = ob->lay;
base->object = ob; base->object = ob;
base->flag = ob->flag; base->flag = ob->flag;
@ -10593,7 +10596,7 @@ static void library_append_end(const bContext *C, Main *mainl, FileData **fd, in
/* don't instance anything when linking in scenes, assume the scene its self instances the data */ /* don't instance anything when linking in scenes, assume the scene its self instances the data */
} }
else { else {
give_base_to_objects(mainvar, scene, curlib, idcode, is_link); give_base_to_objects(mainvar, scene, curlib, idcode, is_link, flag & FILE_ACTIVELAY);
if (flag & FILE_GROUP_INSTANCE) { if (flag & FILE_GROUP_INSTANCE) {
give_base_to_groups(mainvar, scene); give_base_to_groups(mainvar, scene);