Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarley Acheson <harley.acheson@gmail.com>2020-05-28 21:34:31 +0300
committerHarley Acheson <harley.acheson@gmail.com>2020-05-28 21:34:31 +0300
commit2deb6c51778701135a54c05043a123a715cde938 (patch)
tree1d10c459bdcdaf29163466ad3169c3db97dfa6ca /source/blender/editors/screen/screen_intern.h
parent1be79dc2a09aa66a1dab2d9d312dd5fcb4395bd0 (diff)
Fix for T77111: Joins Areas Without Creating Invalid Edges
Properly align every involved edge when performing 'tolerant' area joins. Differential Revision: https://developer.blender.org/D7859 Reviewed by Brecht Van Lommel
Diffstat (limited to 'source/blender/editors/screen/screen_intern.h')
-rw-r--r--source/blender/editors/screen/screen_intern.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h
index a5e0263104d..2d42313d528 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -35,6 +35,8 @@ struct bContextDataResult;
#define AZONEFADEIN (5.0f * U.widget_unit) /* when azone is totally visible */
#define AZONEFADEOUT (6.5f * U.widget_unit) /* when we start seeing the azone */
+#define AREAJOINTOLERANCE (1.0f * U.widget_unit) /* Edges must be close to allow joining. */
+
/* Expanded interaction influence of area borders. */
#define BORDERPADDING (U.dpi_fac + U.pixelsize)