diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-06-23 08:21:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-23 08:22:59 +0300 |
| commit | ed68fee665fae983e3031260e01deff5053065a8 (patch) | |
| tree | 3459616deaf307c3ab79cff2eeffa42059b5f7e1 /source | |
| parent | 374e412813ca1752fc5e4b5bb2915d69cf872cf4 (diff) | |
Fix T78146: Crash using scroll bars
Regression in 2fdca5bd1981c
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 1e1f4e1a55b..a87863bca41 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1408,8 +1408,10 @@ struct View2DScrollers { int vert_min, vert_max; /* vertical scrollbar */ int hor_min, hor_max; /* horizontal scrollbar */ - rcti hor, vert; /* exact size of slider backdrop */ - int horfull, vertfull; /* set if sliders are full, we don't draw them */ + /** Exact size of slider backdrop. */ + rcti hor, vert; + /* set if sliders are full, we don't draw them */ + /* int horfull, vertfull; */ /* UNUSED */ }; /* Calculate relevant scroller properties */ diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 0585f7cf7cd..0efb49f42bf 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1922,6 +1922,9 @@ struct View2DScrollers { /* focus bubbles */ int vert_min, vert_max; /* vertical scrollbar */ int hor_min, hor_max; /* horizontal scrollbar */ + + /* These values are written into, even if we don't use them. */ + rcti _hor, _vert; }; /* quick enum for vsm->zone (scroller handles) */ |