From d7f05fd445e186eefa2aa3c254854ca9c3d6c832 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sun, 19 Apr 2020 14:36:22 +0200 Subject: Fix T74809: Use after free when merging specific areas Was incorrectly triggering animation for panels which would be free'd before the animation ended. --- source/blender/editors/interface/interface_panel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index d1c61925d40..2ad1c25305c 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -428,7 +428,8 @@ void UI_panel_end( } int align = panel_aligned(area, region); - if (old_region_ofsx != panel_region_offset_x_get(region, align)) { + panel->runtime.region_ofsx = panel_region_offset_x_get(region, align); + if (old_region_ofsx != panel->runtime.region_ofsx) { panel->runtime_flag |= PNL_ANIM_ALIGN; } } -- cgit v1.2.3