Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-05-01 15:31:20 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-05-01 15:32:22 +0300
commit185e1d53950faa9b56c812793f2bbda21d7489f8 (patch)
treeca525c913bc18eb126c0034d9e2a292ef268337e /source/blender/editors/transform/transform.c
parentae049a6c6ac545b2c9eadf759f40ad864f436ff1 (diff)
Fix T76254: 'Normal' Transformation Orientation using Global
Issue introduced in rBc57e4418bb85.
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r--source/blender/editors/transform/transform.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 843c60ec87c..9ce98611b40 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -828,8 +828,7 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, bool is
if (ELEM(cmode, '\0', axis)) {
/* Successive presses on existing axis, cycle orientation modes. */
t->orientation.index = (t->orientation.index + 1) % ARRAY_SIZE(t->orientation.types);
- BLI_assert(t->orientation.types[0] != V3D_ORIENT_CUSTOM_MATRIX);
- initTransformOrientation(t->context, t, t->orientation.types[t->orientation.index]);
+ initTransformOrientation(t->context, t);
}
if (t->orientation.index == 0) {
@@ -1894,10 +1893,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
unit_m3(t->spacemtx);
initTransInfo(C, t, op, event);
-
- /* Although `t->orientation.index` can be different from 0, always init the
- * default orientation so that in redo the contraint uses the `orient_matrix` */
- initTransformOrientation(C, t, t->orientation.types[0]);
+ initTransformOrientation(C, t);
if (t->spacetype == SPACE_VIEW3D) {
t->draw_handle_apply = ED_region_draw_cb_activate(