diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 16:16:45 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 16:16:45 +0300 |
| commit | a6585fa4b1a7a4dd4b5ea21efcee36c8460ff5ec (patch) | |
| tree | 1767ffcbd73592950909c2c0cdb3816700453553 /source/blender/blenloader/intern | |
| parent | d617a6c85b4874a81d86568d00b56f2bda11c4b4 (diff) | |
Cleanup: moar removal of G.main in BKE area...
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 4df79250125..d172dd685eb 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7582,9 +7582,9 @@ static void direct_link_group(FileData *fd, Group *group) group->preview = direct_link_preview_image(fd, group->preview); } -static void lib_link_group(FileData *fd, Main *main) +static void lib_link_group(FileData *fd, Main *bmain) { - for (Group *group = main->group.first; group; group = group->id.next) { + for (Group *group = bmain->group.first; group; group = group->id.next) { if (group->id.tag & LIB_TAG_NEED_LINK) { IDP_LibLinkProperty(group->id.properties, fd); @@ -7601,7 +7601,7 @@ static void lib_link_group(FileData *fd, Main *main) if (add_us) { id_us_ensure_real(&group->id); } - BKE_group_object_unlink(group, NULL, NULL, NULL); /* removes NULL entries */ + BKE_group_object_unlink(bmain, group, NULL, NULL, NULL); /* removes NULL entries */ group->id.tag &= ~LIB_TAG_NEED_LINK; } |