diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-07 01:10:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-07 01:10:08 +0300 |
| commit | 5a5646934c976425dfea005ccacf792a2cd28407 (patch) | |
| tree | 53631b0bf5e6aff4c901161f50a425f0e840220f /source | |
| parent | f21d0bacf7ae3e1efd0a88f174edc152b8a4ce6c (diff) | |
Fix for transform orientation fix, probably forgot to commit this?
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index fa6267c4a5c..1cbb7d0ab56 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1500,7 +1500,6 @@ static EnumPropertyItem prop_view_items[] = { /* would like to make this a generic function - outside of transform */ -extern void getTransformOrientationMatrix(const bContext *C, float twmat[][4], int activeOnly); static void axis_set_view(bContext *C, float q1, float q2, float q3, float q4, short view, int perspo, int align_active) { @@ -1520,12 +1519,12 @@ static void axis_set_view(bContext *C, float q1, float q2, float q3, float q4, s } else { float obact_quat[4]; - float twmat[4][4]; + float twmat[3][3]; /* same as transform manipulator when normal is set */ - getTransformOrientationMatrix(C, twmat, TRUE); + ED_getTransformOrientationMatrix(C, twmat, TRUE); - Mat4ToQuat(twmat, obact_quat); + Mat3ToQuat(twmat, obact_quat); QuatInv(obact_quat); QuatMul(new_quat, new_quat, obact_quat); |