diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-18 11:17:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-18 11:17:55 +0300 |
commit | 959b40c2a8605c4fa48259e401682b4cd2a1f120 (patch) | |
tree | 851101baf6caa997a07fc1283c73548ab0608e8b /source/blender/blenloader | |
parent | eb559f2b24580178ea60891077481df16c05aec6 (diff) | |
parent | 16665ad753cd511a57108c6491f7b4bebe4dffd4 (diff) |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 6 |
2 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 7257c26e1d2..3866878b12a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7258,13 +7258,6 @@ static void direct_link_area(FileData *fd, ScrArea *area) } v3d->shading.prev_type = OB_SOLID; - if (v3d->fx_settings.dof) { - v3d->fx_settings.dof = newdataadr(fd, v3d->fx_settings.dof); - } - if (v3d->fx_settings.ssao) { - v3d->fx_settings.ssao = newdataadr(fd, v3d->fx_settings.ssao); - } - direct_link_view3dshading(fd, &v3d->shading); blo_do_versions_view3d_split_250(v3d, &sl->regionbase); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index d24fca4391a..2966a030f63 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2853,12 +2853,6 @@ static void write_area_regions(WriteData *wd, ScrArea *area) writestruct(wd, DATA, View3D, 1, v3d->localvd); } - if (v3d->fx_settings.ssao) { - writestruct(wd, DATA, GPUSSAOSettings, 1, v3d->fx_settings.ssao); - } - if (v3d->fx_settings.dof) { - writestruct(wd, DATA, GPUDOFSettings, 1, v3d->fx_settings.dof); - } write_view3dshading(wd, &v3d->shading); } else if (sl->spacetype == SPACE_GRAPH) { |