From b65cc25be3828c6e01b9bd5cbd9d6c003c4e455f Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Sun, 16 May 2010 17:01:05 +0000 Subject: [PATCH] [#22114] Manipulator Transform Orientation not respected Potential fix (the error would explain the gimbal case, not the normal case. Also, it doesn't explain why it worked from time to time on other platforms). --- source/blender/editors/transform/transform_generics.c | 2 +- source/blender/editors/transform/transform_orientations.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 99793f4010a..58fc93de745 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -960,7 +960,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) { t->current_orientation = RNA_enum_get(op->ptr, "constraint_orientation"); - if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C) - 1) + if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C)) { t->current_orientation = V3D_MANIP_GLOBAL; } diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index e18f7fc05ce..e926762709d 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -517,6 +517,7 @@ void initTransformOrientation(bContext *C, TransInfo *t) case V3D_MANIP_GIMBAL: unit_m3(t->spacemtx); if (gimbal_axis(ob, t->spacemtx)) { + strcpy(t->spacename, "gimbal"); break; } /* no gimbal fallthrough to normal */