diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-01-22 17:33:57 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-01-22 17:43:19 +0300 |
commit | 76289613910073ab4a2273d96e1b92999ed838b1 (patch) | |
tree | 17619426e72b74b097e94b9474f4983c25731658 /source/blender/blenloader | |
parent | 8e5f433554150c139ffcf197eec78bb66555aef2 (diff) |
Collections/Layer cleanup: Remove all reference to filter objects
This was not implemented yet. So it's a bit pointless to have all this
placeholder code around without any functionality coming out of it.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 87f8b568023..2cb799d39b9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5850,11 +5850,6 @@ static void lib_link_scene_collection(FileData *fd, Library *lib, SceneCollectio BLI_assert(link->data); } - for (LinkData *link = sc->filter_objects.first; link; link = link->next) { - link->data = newlibadr_us(fd, lib, link->data); - BLI_assert(link->data); - } - for (SceneCollection *nsc = sc->scene_collections.first; nsc; nsc = nsc->next) { lib_link_scene_collection(fd, lib, nsc); } @@ -6139,7 +6134,6 @@ static void direct_link_view_settings(FileData *fd, ColorManagedViewSettings *vi static void direct_link_scene_collection(FileData *fd, SceneCollection *sc) { link_list(fd, &sc->objects); - link_list(fd, &sc->filter_objects); link_list(fd, &sc->scene_collections); for (SceneCollection *nsc = sc->scene_collections.first; nsc; nsc = nsc->next) { @@ -9917,10 +9911,6 @@ static void expand_scene_collection(FileData *fd, Main *mainvar, SceneCollection expand_doit(fd, mainvar, link->data); } - for (LinkData *link = sc->filter_objects.first; link; link = link->next) { - expand_doit(fd, mainvar, link->data); - } - for (SceneCollection *nsc= sc->scene_collections.first; nsc; nsc = nsc->next) { expand_scene_collection(fd, mainvar, nsc); } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index dffbb88f708..80d77870614 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2594,7 +2594,6 @@ static void write_scene_collection(WriteData *wd, SceneCollection *sc) writestruct(wd, DATA, SceneCollection, 1, sc); writelist(wd, DATA, LinkData, &sc->objects); - writelist(wd, DATA, LinkData, &sc->filter_objects); for (SceneCollection *nsc = sc->scene_collections.first; nsc; nsc = nsc->next) { write_scene_collection(wd, nsc); |