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-09-12 18:11:18 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-09-13 08:46:18 +0300
commit86c73ea8d7ac671c0e6153a5aa6572c6d489efe2 (patch)
tree0a302618e19512bd5bb2f61f2b1d6e48fda75688 /source/blender/editors/manipulator_library
parent8a5af5202c51e29284a03245d7331a4f2fe6d08f (diff)
Manipulator: fix cage2d scaling
Diffstat (limited to 'source/blender/editors/manipulator_library')
-rw-r--r--source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
index ec924a32035..9f0220dbc76 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
@@ -637,8 +637,8 @@ static int manipulator_rect_transform_modal(
/* Cursor deltas scaled to (-0.5..0.5). */
float delta_orig[2], delta_curr[2];
for (int i = 0; i < 2; i++) {
- delta_orig[i] = (data->orig_mouse[i] / dims[i]) - pivot[i];
- delta_curr[i] = (point_local[i] / dims[i]) - pivot[i];
+ delta_orig[i] = ((data->orig_mouse[i] - data->orig_matrix_offset[3][i]) / dims[i]) - pivot[i];
+ delta_curr[i] = ((point_local[i] - data->orig_matrix_offset[3][i]) / dims[i]) - pivot[i];
}
float scale[2] = {1.0f, 1.0f};