diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-02-03 20:57:06 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-02-03 20:57:06 +0300 |
| commit | 9d902d1b30f828d6861e38a3afd068ec5dcecd21 (patch) | |
| tree | ff2a7ff90ad59b18f54d82d7d1bc2c80f33c40cd /source/blender/editors/transform/transform_gizmo_3d.c | |
| parent | dcb2821292f962951e88f146cb304160f21f73da (diff) | |
| parent | 5eb5a7f4b7d7c5228ec9596b35e7f2e317aad97d (diff) | |
Merge branch 'blender-v2.92-release'
# Conflicts:
# source/blender/editors/transform/transform_constraints.c
Diffstat (limited to 'source/blender/editors/transform/transform_gizmo_3d.c')
| -rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 5b9d73a10fe..0a4448f82f9 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -1865,7 +1865,10 @@ static void WIDGETGROUP_gizmo_invoke_prepare(const bContext *C, PropertyRNA *prop_orient_type = RNA_struct_find_property(ptr, "orient_type"); const TransformOrientationSlot *orient_slot = BKE_scene_orientation_slot_get_from_flag( scene, ggd->twtype_init); - if (orient_slot == &scene->orientation_slots[SCE_ORIENT_DEFAULT]) { + if ((gz == ggd->gizmos[MAN_AXIS_ROT_C]) || + (orient_slot == &scene->orientation_slots[SCE_ORIENT_DEFAULT])) { + /* #MAN_AXIS_ROT_C always uses the #V3D_ORIENT_VIEW orientation, + * optionally we could set this orientation instead of unset the property. */ RNA_property_unset(ptr, prop_orient_type); } else { |