diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-05 11:10:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-05 16:51:13 +0300 |
| commit | 1983eea98ef73e6fe4c9bd187944d122dc1c7b07 (patch) | |
| tree | e956537a0f96cae1e7c3429fdde791a139f19595 /source/blender/editors/space_view3d | |
| parent | 46ee9946084ff49620518109b27302ca767d592f (diff) | |
Cleanup: remove legacy 3D view data.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index d68c0508e33..ee65cc01797 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -395,14 +395,6 @@ static void view3d_free(SpaceLink *sl) if (vd->properties_storage) MEM_freeN(vd->properties_storage); - /* matcap material, its preview rect gets freed via icons */ - if (vd->defmaterial) { - if (vd->defmaterial->gpumaterial.first) - GPU_material_free(&vd->defmaterial->gpumaterial); - BKE_previewimg_free(&vd->defmaterial->preview); - MEM_freeN(vd->defmaterial); - } - if (vd->fx_settings.ssao) MEM_freeN(vd->fx_settings.ssao); if (vd->fx_settings.dof) @@ -434,8 +426,6 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl) /* copy or clear inside new stuff */ - v3dn->defmaterial = NULL; - v3dn->properties_storage = NULL; if (v3dn->fx_settings.dof) v3dn->fx_settings.dof = MEM_dupallocN(v3do->fx_settings.dof); @@ -748,7 +738,6 @@ static void *view3d_main_region_duplicate(void *poin) new->render_engine = NULL; new->sms = NULL; new->smooth_timer = NULL; - new->compositor = NULL; return new; } @@ -1419,8 +1408,6 @@ static void view3d_id_remap(ScrArea *sa, SpaceLink *slink, ID *old_id, ID *new_i /* Values in local-view aren't used, see: T52663 */ if (is_local == false) { - /* Skip 'v3d->defmaterial', it's not library data. */ - if ((ID *)v3d->ob_centre == old_id) { v3d->ob_centre = (Object *)new_id; /* Otherwise, bonename may remain valid... We could be smart and check this, too? */ |