diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-11-12 16:31:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-11-12 16:31:03 +0300 |
commit | c7a88cf91a0ea17ae58c78868f354a1e93df646a (patch) | |
tree | 8eb853621a31add04c4fba4608db994587f3158e /source/blender/editors/transform | |
parent | a470e3c9d18a6dbd24fe008d1258995263ac7761 (diff) | |
parent | 5f7d5c0809104bf702dff4be1b706c6841095fda (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index d3aaae7253e..6a2353d403f 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -1062,9 +1062,13 @@ int ED_transform_calc_gizmo_stats(const bContext *C, } } - /* Protect-flags apply to world space in object mode, so only let them influence axis - * visibility if we show the global orientation, otherwise it's confusing. */ - if (ELEM(orient_index, V3D_ORIENT_LOCAL, V3D_ORIENT_GIMBAL)) { + if (orient_index == V3D_ORIENT_GLOBAL) { + /* Protect-flags apply to world space in object mode, + * so only let them influence axis visibility if we show the global orientation, + * otherwise it's confusing. */ + protectflag_to_drawflags(base->object->protectflag & OB_LOCK_LOC, &rv3d->twdrawflag); + } + else if (ELEM(orient_index, V3D_ORIENT_LOCAL, V3D_ORIENT_GIMBAL)) { protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag); } totsel++; |