diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-10-19 15:15:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-19 15:15:08 +0400 |
commit | 03d4121a55a831f1df87c6ba09a520aabe5312d7 (patch) | |
tree | 28372cdb391c4f8d97ffc46cf33cadec37e36b6f /source/blender/editors | |
parent | 5738f3b0b484e35582ac8dd8e46a75b66c0a6db3 (diff) |
Cancelling rotation on axis/angle object rotation didnt restore the original rotation.
also commented drotAxis/Angle since its not used yet.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/transform/transform.h | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index bb6ffe9155f..c897c1df842 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -131,8 +131,8 @@ typedef struct TransCon { typedef struct TransDataExtension { float drot[3]; /* Initial object drot */ - float drotAngle; /* Initial object drotAngle */ - float drotAxis[3]; /* Initial object drotAxis */ + // float drotAngle; /* Initial object drotAngle, TODO: not yet implimented */ + // float drotAxis[3]; /* Initial object drotAxis, TODO: not yet implimented */ float dquat[4]; /* Initial object dquat */ float dsize[3]; /* Initial object dsize */ float *rot; /* Rotation of the data to transform (Faculative) */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index d723f77f537..7e74d12941b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4298,8 +4298,8 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) td->ext->irotAngle= ob->rotAngle; VECCOPY(td->ext->irotAxis, ob->rotAxis); - td->ext->drotAngle= ob->drotAngle; - VECCOPY(td->ext->drotAxis, ob->drotAxis); + // td->ext->drotAngle= ob->drotAngle; // XXX, not implimented + // VECCOPY(td->ext->drotAxis, ob->drotAxis); // XXX, not implimented } else { td->ext->rot= NULL; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index c473d6395ec..cd40cb3bb25 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1177,6 +1177,13 @@ static void restoreElement(TransData *td) { if (td->ext->rot) { VECCOPY(td->ext->rot, td->ext->irot); } + if(td->ext->rotAngle) { + *td->ext->rotAngle= td->ext->irotAngle; + } + if(td->ext->rotAxis) { + VECCOPY(td->ext->rotAxis, td->ext->irotAxis); + } + /* XXX, drotAngle & drotAxis not used yet */ if (td->ext->size) { VECCOPY(td->ext->size, td->ext->isize); } |