From 40b84ffc5067af7b6897bd5e099cefd2ae07c058 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 2 Feb 2022 15:04:57 +0100 Subject: [PATCH] Draw Manager: Marked work around code. Mark the work around that was added for the VSE memory leak. --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- source/blender/draw/engines/image/image_drawing_mode.hh | 3 ++- source/tools | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index 620b85f16d0..05005841745 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 620b85f16d03a6aadd7cae56969c9c29b06b992d +Subproject commit 050058417452bfba0cc9ae8692173eb02ac1ef3a diff --git a/release/scripts/addons b/release/scripts/addons index 67f1fbca148..faa9fc7f98e 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230 +Subproject commit faa9fc7f98e19be54a715c24061185b04dff5b6c diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 7936dde9ece..61e45814503 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 7936dde9ece881d531b1a2ee6c45ddb56d30038c +Subproject commit 61e45814503f51963c91c51aaf764612e7c5dc72 diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh index a355b42d66c..82fff0c4ddb 100644 --- a/source/blender/draw/engines/image/image_drawing_mode.hh +++ b/source/blender/draw/engines/image/image_drawing_mode.hh @@ -314,7 +314,7 @@ template class ScreenSpaceDrawingMode : public AbstractD 0); imb_freerectImbuf_all(&extracted_buffer); } - + /* TODO(jbakker): Find leak when rendering VSE and remove this call. */ if (float_buffer_created) { imb_freerectfloatImBuf(iterator.tile_data.tile_buffer); } @@ -430,6 +430,7 @@ template class ScreenSpaceDrawingMode : public AbstractD uv_to_texel, crop_rect_ptr); + /* TODO(jbakker): Find leak when rendering VSE and remove this call. */ if (float_buffer_created) { imb_freerectfloatImBuf(&tile_buffer); } diff --git a/source/tools b/source/tools index 26bc78162ec..7fd2ed908b4 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 26bc78162ec89f21453ce3ded7b999bc6649f32b +Subproject commit 7fd2ed908b4f50140670caf6786e5ed245b79137