[Bf-blender-cvs] [2041174] blender-v2.72-release: Fix T42030: Grabbing the whole mask interfere with grabbing individual curve

[Sergey Sharybin]

Commit: 2041174ef964fff6f0a6c7fdec7f91f96cc6646f
Author: Sergey Sharybin
Date:   Thu Oct 2 19:28:07 2014 +0600
Branches: blender-v2.72-release
https://developer.blender.org/rB2041174ef964fff6f0a6c7fdec7f91f96cc6646f

Fix T42030: Grabbing the whole mask interfere with grabbing individual curve

This fix is for the final 2.72 release.

===================================================================

M	source/blender/editors/mask/mask_ops.c

===================================================================

diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index 16e1733..c3959f9 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -580,7 +580,10 @@ static bool spline_under_mouse_get(const bContext *C,
 			}
 		}
 	}
-	if (closest_spline != NULL) {
+	/* TODO(sergey): Chech whether tesellated spline point is closer
+	 * to the mouse than the spline center.
+	 */
+	if (closest_dist_squared < 32.0f * 32.0f && closest_spline != NULL) {
 		*mask_layer_r = closest_layer;
 		*mask_spline_r = closest_spline;
 		return true;