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-21 16:57:35 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-05-21 17:01:06 +0300
commita39ca327bc8491129d9794d136b39a6ba8cd6ffa (patch)
tree4d9e975a54ba2a0b796ac4f307b11297cf4836b8 /source/blender/editors/transform/transform_generics.c
parentde7d32bb7dcc7364a07fe23ab0205c70d1db06e4 (diff)
Fix T76935: Current orientation not taken in account when using "Align to transform orientation"
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r--source/blender/editors/transform/transform_generics.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 36dc01fc9c6..2f3b50a7c1a 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1660,8 +1660,15 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
orient_type_scene += index_custom;
}
- short orient_type_default = V3D_ORIENT_VIEW;
+ short orient_type_default;
short orient_type_constraint[2];
+ if ((t->flag & T_MODAL) && transform_mode_is_changeable(t->mode)) {
+ /* During modal, rotation starts with the View orientation. */
+ orient_type_default = V3D_ORIENT_VIEW;
+ }
+ else {
+ orient_type_default = orient_type_scene;
+ }
if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis"))) {
t->orient_axis = RNA_property_enum_get(op->ptr, prop);