[Bf-blender-cvs] [a2f22310149] blender2.8: Fix grab3d manipulator in a 2D group

Campbell Barton noreply at git.blender.org
Mon Dec 11 07:09:01 CET 2017


Commit: a2f223101490fceea2fa5d58acb4165c6d2d7bc1
Author: Campbell Barton
Date:   Mon Dec 11 17:07:40 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBa2f223101490fceea2fa5d58acb4165c6d2d7bc1

Fix grab3d manipulator in a 2D group

Was taking scale into account twice.

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

M	source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c

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

diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
index 151e173e5e6..4e62c9c396e 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
@@ -302,7 +302,8 @@ static int manipulator_grab_test_select(
 		return -1;
 	}
 
-	if (len_squared_v2(point_local) < SQUARE(mpr->scale_final)) {
+	/* The 'mpr->scale_final' is already applied when projecting. */
+	if (len_squared_v2(point_local) < 1.0f) {
 		return 0;
 	}



More information about the Bf-blender-cvs mailing list