diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-11 03:05:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-11 03:05:35 +0400 |
| commit | 5eb37f9e5cd07dde10cc84b83c0d2ed8c4014631 (patch) | |
| tree | 100649e15eff10cf160683f53fae4259eb45be59 /source/blender/editors/transform/transform_constraints.c | |
| parent | 8c1cb10cfd5e6f5edcb23a8a28db2287ed463eb4 (diff) | |
correction to own recent changes to exitmode using axis-matrix, fallback to old behavior for editmodes where the axis-matrix isnt set (curve, surface, lattice)
Diffstat (limited to 'source/blender/editors/transform/transform_constraints.c')
| -rw-r--r-- | source/blender/editors/transform/transform_constraints.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 5515ca69bba..87bb1e1f154 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -559,7 +559,10 @@ void setLocalConstraint(TransInfo *t, int mode, const char text[]) { /* edit-mode now allows local transforms too */ #if 1 - if ((t->flag & T_EDIT) && (t->around != V3D_LOCAL)) { + if ((t->flag & T_EDIT) && + /* not all editmode supports axis-matrix */ + ((t->around != V3D_LOCAL) || (!ELEM3(t->obedit->type, OB_MESH, OB_MBALL, OB_ARMATURE)))) + { float obmat[3][3]; copy_m3_m4(obmat, t->scene->obedit->obmat); normalize_m3(obmat); |