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:
authorCampbell Barton <ideasman42@gmail.com>2017-12-11 09:07:40 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-12-11 09:07:40 +0300
commita2f223101490fceea2fa5d58acb4165c6d2d7bc1 (patch)
tree30cc40cb49acdd0330a9b5b43b9b8b809c532ab4 /source/blender/editors/manipulator_library
parent53394c60188a6ce23835226022a8bc7ea3bcecf9 (diff)
Fix grab3d manipulator in a 2D group
Was taking scale into account twice.
Diffstat (limited to 'source/blender/editors/manipulator_library')
-rw-r--r--source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c3
1 files changed, 2 insertions, 1 deletions
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;
}