diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/draw/engines/eevee/eevee_data.c | |
parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_data.c')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_data.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c index 8893a8c62e9..92a992f578b 100644 --- a/source/blender/draw/engines/eevee/eevee_data.c +++ b/source/blender/draw/engines/eevee/eevee_data.c @@ -39,15 +39,13 @@ static void eevee_scene_layer_data_free(void *storage) DRW_UBO_FREE_SAFE(sldata->light_ubo); DRW_UBO_FREE_SAFE(sldata->shadow_ubo); DRW_UBO_FREE_SAFE(sldata->shadow_render_ubo); - DRW_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cube_target_fb); - DRW_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cube_fb); - DRW_FRAMEBUFFER_FREE_SAFE(sldata->shadow_map_fb); - DRW_FRAMEBUFFER_FREE_SAFE(sldata->shadow_cascade_fb); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_depth_cube_target); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_color_cube_target); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_depth_cube_pool); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_depth_map_pool); - DRW_TEXTURE_FREE_SAFE(sldata->shadow_depth_cascade_pool); + DRW_FRAMEBUFFER_FREE_SAFE(sldata->shadow_target_fb); + DRW_FRAMEBUFFER_FREE_SAFE(sldata->shadow_store_fb); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_target); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cube_blur); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_target); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_cascade_blur); + DRW_TEXTURE_FREE_SAFE(sldata->shadow_pool); BLI_freelistN(&sldata->shadow_casters); /* Probes */ @@ -61,6 +59,9 @@ static void eevee_scene_layer_data_free(void *storage) DRW_TEXTURE_FREE_SAFE(sldata->probe_pool); DRW_TEXTURE_FREE_SAFE(sldata->irradiance_pool); DRW_TEXTURE_FREE_SAFE(sldata->irradiance_rt); + + /* Volumetrics */ + MEM_SAFE_FREE(sldata->volumetrics); } static void eevee_lamp_data_free(void *storage) |