diff options
| author | Julian Eisel <julian@blender.org> | 2020-04-19 15:36:22 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-04-19 15:36:22 +0300 |
| commit | 3cd147b49ff5052fc4a6d0a512b774776711f685 (patch) | |
| tree | 6da0526bb2f9aba10eaac69c9df9605b40c948d4 /source/blender/editors/interface/interface_panel.c | |
| parent | 1f1520a04503d946b7120ddc681282bc2d4b3036 (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/interface/interface_panel.c')
| -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 b8f87a4300c..f824670cc57 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; } } |