diff options
Diffstat (limited to 'source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c')
| -rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c index 6a7fde5a5b5..fae73e5f622 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c @@ -118,8 +118,8 @@ static void manipulator_primitive_draw_intern( copy_v3_fl(col_outer, 0.5f); col_outer[3] = 0.8f; - copy_m4_m4(mat, inter->init_matrix); - mul_mat3_m4_fl(mat, inter->init_scale); + copy_m4_m4(mat, inter->init_matrix_basis); + mul_mat3_m4_fl(mat, inter->init_scale_final); gpuPushMatrix(); gpuMultMatrix(mat); @@ -158,8 +158,8 @@ static void manipulator_primitive_invoke( { ManipulatorInteraction *inter = MEM_callocN(sizeof(ManipulatorInteraction), __func__); - copy_m4_m4(inter->init_matrix, mpr->matrix_basis); - inter->init_scale = mpr->scale_final; + copy_m4_m4(inter->init_matrix_basis, mpr->matrix_basis); + inter->init_scale_final = mpr->scale_final; mpr->interaction_data = inter; } |