From: Campbell Barton Date: Wed, 10 Apr 2013 23:05:35 +0000 (+0000) Subject: correction to own recent changes to exitmode using axis-matrix, fallback to old behav... X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender-staging.git/commitdiff_plain/5eb37f9e5cd07dde10cc84b83c0d2ed8c4014631 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) --- 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);