diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-05-16 22:40:05 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-05-17 00:13:28 +0300 |
commit | e51bf11b15cb2c26b2bd33c377e1eb74fa8bde38 (patch) | |
tree | 0772e04362ca16c1511ccc48517e50e061187f22 /source/blender/blenloader | |
parent | 09e419fa8da930b13651997417a434de308e697d (diff) |
Remove ViewLayer settings - cleanup 1/2
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 9 |
2 files changed, 2 insertions, 15 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 9c020a84536..9618ae432f1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5923,8 +5923,6 @@ static void direct_link_view_layer(FileData *fd, ViewLayer *view_layer) link_list(fd, &(view_layer->freestyle_config.modules)); link_list(fd, &(view_layer->freestyle_config.linesets)); - view_layer->properties_evaluated = NULL; - BLI_listbase_clear(&view_layer->drawdata); view_layer->object_bases_array = NULL; } @@ -6215,15 +6213,9 @@ static void direct_link_scene(FileData *fd, Scene *sce, Main *bmain) direct_link_view_layer(fd, view_layer); } - sce->collection_properties = newdataadr(fd, sce->collection_properties); - IDP_DirectLinkGroup_OrFree(&sce->collection_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); - sce->layer_properties = newdataadr(fd, sce->layer_properties); IDP_DirectLinkGroup_OrFree(&sce->layer_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); - BKE_layer_collection_engine_settings_validate_scene(sce); - BKE_view_layer_engine_settings_validate_scene(sce); - direct_link_workspace_link_scene_data(fd, sce, &bmain->workspaces); } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index db4415cea3c..bb136cb937d 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2629,13 +2629,8 @@ static void write_scene(WriteData *wd, Scene *sce) write_view_layer(wd, view_layer); } - if (sce->layer_properties) { - IDP_WriteProperty(sce->layer_properties, wd); - } - - if (sce->collection_properties) { - IDP_WriteProperty(sce->collection_properties, wd); - } + /* Freed on doversion. */ + BLI_assert(sce->layer_properties == NULL); } static void write_gpencil(WriteData *wd, bGPdata *gpd) |