[Bf-blender-cvs] [86c73ea8d7a] blender2.8: Manipulator: fix cage2d scaling
Campbell Barton
noreply at git.blender.org
Wed Sep 13 07:53:32 CEST 2017
Commit: 86c73ea8d7ac671c0e6153a5aa6572c6d489efe2
Author: Campbell Barton
Date: Wed Sep 13 01:11:18 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB86c73ea8d7ac671c0e6153a5aa6572c6d489efe2
Manipulator: fix cage2d scaling
===================================================================
M source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
===================================================================
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};
More information about the Bf-blender-cvs
mailing list