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>2021-02-03 20:48:08 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2021-02-03 20:54:58 +0300
commit5eb5a7f4b7d7c5228ec9596b35e7f2e317aad97d (patch)
tree9d3e443feeaeb0fa47fe56cd9bd2157b5a23d3f8
parentbbd74e9fd4ce014cc98c76eae03563dd0c0d1727 (diff)
Fix unreported: Rotation Gizmo "C" influenced by custom orientation
The white rotation Gizmo should always use the View orientation. Before, if you set an orientation for the gizmo other than the default, that gizmo would behave like the contraint Z Gizmo.
-rw-r--r--source/blender/editors/transform/transform_gizmo_3d.c5
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 166fded5209..be29c1cda02 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 {