[Bf-blender-cvs] [ed68fee665f] master: Fix T78146: Crash using scroll bars
Campbell Barton
noreply at git.blender.org
Tue Jun 23 07:24:09 CEST 2020
Commit: ed68fee665fae983e3031260e01deff5053065a8
Author: Campbell Barton
Date: Tue Jun 23 15:21:30 2020 +1000
Branches: master
https://developer.blender.org/rBed68fee665fae983e3031260e01deff5053065a8
Fix T78146: Crash using scroll bars
Regression in 2fdca5bd1981c
===================================================================
M source/blender/editors/interface/view2d.c
M source/blender/editors/interface/view2d_ops.c
===================================================================
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) */
More information about the Bf-blender-cvs
mailing list