diff options
| author | Julian Eisel <julian@blender.org> | 2020-04-19 15:36:22 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-04-19 20:05:49 +0300 |
| commit | d7f05fd445e186eefa2aa3c254854ca9c3d6c832 (patch) | |
| tree | b56575078661c45ba1888f3e826ae0a0ec0831ed /source/blender/editors | |
| parent | 89d49ae218b731b6e6f89457b8180c857a05637d (diff) | |
Fix T74809: Use after free when merging specific areas
Was incorrectly triggering animation for panels which would be free'd
before the animation ended.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } } |