diff options
| author | YimingWu <xp8110@outlook.com> | 2020-05-30 11:34:11 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-05-30 11:34:11 +0300 |
| commit | 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9 (patch) | |
| tree | 668b6b25da0efdb87058b197084094181fb0c09f /source/blender/editors/screen/screen_geometry.c | |
| parent | cd54abd2c1316136753f7bbe227bd762a5f9e7d9 (diff) | |
| parent | 2ee94c954d6700a45fde320f330964bcf1888545 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# source/blender/blenkernel/intern/lib_query.c
Diffstat (limited to 'source/blender/editors/screen/screen_geometry.c')
| -rw-r--r-- | source/blender/editors/screen/screen_geometry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_geometry.c b/source/blender/editors/screen/screen_geometry.c index 4069795657e..47580c2f4b3 100644 --- a/source/blender/editors/screen/screen_geometry.c +++ b/source/blender/editors/screen/screen_geometry.c @@ -92,7 +92,7 @@ ScrEdge *screen_geom_area_map_find_active_scredge(const ScrAreaMap *area_map, const int mx, const int my) { - int safety = U.widget_unit / 10; + int safety = BORDERPADDING; CLAMP_MIN(safety, 2); |