[Bf-blender-cvs] [5892622d684] master: Revert "Fix memory leak in recent panel drag widget cache"

Campbell Barton noreply at git.blender.org
Tue Apr 7 14:11:39 CEST 2020


Commit: 5892622d684cf23ac0eaadcb9f501699255ceec7
Author: Campbell Barton
Date:   Tue Apr 7 22:09:08 2020 +1000
Branches: master
https://developer.blender.org/rB5892622d684cf23ac0eaadcb9f501699255ceec7

Revert "Fix memory leak in recent panel drag widget cache"

This reverts commit 58e20b432a2bd7fbff7ebb7aa1f49a6662dc6e7c.

Was calling discard twice, tsk.
Although for some reason it did quiet the leak.

Reverting because this is causing a crash.

===================================================================

M	source/blender/gpu/intern/gpu_batch_presets.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_batch_presets.c b/source/blender/gpu/intern/gpu_batch_presets.c
index 9a282e95664..34bd921992c 100644
--- a/source/blender/gpu/intern/gpu_batch_presets.c
+++ b/source/blender/gpu/intern/gpu_batch_presets.c
@@ -309,7 +309,6 @@ GPUBatch *GPU_batch_preset_panel_drag_widget(const float pixelsize,
                                   !equals_v4v4(g_presets_2d.panel_drag_widget_col_dark, col_dark);
 
   if (g_presets_2d.batch.panel_drag_widget && parameters_changed) {
-    GPU_batch_discard(g_presets_2d.batch.panel_drag_widget);
     gpu_batch_presets_unregister(g_presets_2d.batch.panel_drag_widget);
     GPU_batch_discard(g_presets_2d.batch.panel_drag_widget);
     g_presets_2d.batch.panel_drag_widget = NULL;



More information about the Bf-blender-cvs mailing list