diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-26 12:17:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-26 13:15:45 +0300 |
commit | 0a87bf67849be91d4b874862815c8ca9e93a4047 (patch) | |
tree | c12214b43e827cb1215ec44b20f03cb08bb427f5 /source/blender/editors/transform/transform.h | |
parent | 13dd8b69f036980b7ad14b692ad5c1edb11745d0 (diff) |
Transform: don't set the user constraint when it's not set
The orientation for the redo panel would be set even when not used,
add an 'unset' orientation which defaults to global.
Diffstat (limited to 'source/blender/editors/transform/transform.h')
-rw-r--r-- | source/blender/editors/transform/transform.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 881de792391..b234dabdc0b 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -607,6 +607,10 @@ typedef struct TransInfo { short launch_event; struct { + /** Orientation type when when we're not constrained. + * nearly always global except for rotate which defaults to screen-space orientation. */ + short unset; + /** Orientation to use when a key is pressed. */ short user; /* Used when user is global. */ short user_alt; @@ -913,7 +917,8 @@ void constraintNumInput(TransInfo *t, float vec[3]); bool isLockConstraint(TransInfo *t); int getConstraintSpaceDimension(TransInfo *t); -char constraintModeToChar(TransInfo *t); +int constraintModeToIndex(const TransInfo *t); +char constraintModeToChar(const TransInfo *t); void startConstraint(TransInfo *t); void stopConstraint(TransInfo *t); |