diff options
| author | Martin Poirier <theeth@yahoo.com> | 2005-05-10 03:37:35 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2005-05-10 03:37:35 +0400 |
| commit | 3676fb1b3fa6362d1c713b5d50c429828e921223 (patch) | |
| tree | 3baf2763d345b6fed253f66a874d88ceb7bff06a /source/blender/src/transform.c | |
| parent | f7ba839698cfade3384d820e33357bbfe26c863b (diff) | |
Fixed rotating, didn't take parent into account properly (hmmm, I'm sure this worked before).
That was bug #2516: http://projects.blender.org/tracker/?func=detail&atid=125&aid=2516&group_id=9
Also turned back some changes Ton did to drawing object constraint lines. Explained the why in a longish comment.
Diffstat (limited to 'source/blender/src/transform.c')
| -rwxr-xr-x | source/blender/src/transform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index ffb5a0a2c6a..5288fc1110b 100755 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -1406,12 +1406,14 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3]) { add_tdi_poin(tdi->rotz, tdi->oldrot+2, rot[2]); } else { + Mat3MulMat3(totmat, mat, td->mtx); + Mat3MulMat3(smat, td->smtx, totmat); /* calculate the total rotatation in eulers */ VecAddf(eul, td->ext->irot, td->ext->drot); /* we have to correct for delta rot */ EulToMat3(eul, obmat); /* mat = transform, obmat = object rotation */ - Mat3MulMat3(fmat, mat, obmat); + Mat3MulMat3(fmat, smat, obmat); Mat3ToEul(fmat, eul); compatible_eul(eul, td->ext->irot); |