[Bf-blender-cvs] [0ea60cf6b81] blender-v3.0-release: Fix gizmo protection flag use in object mode
Campbell Barton
noreply at git.blender.org
Fri Nov 12 14:19:51 CET 2021
Commit: 0ea60cf6b813f8b792a253e10a6c2edaf7fb689f
Author: Campbell Barton
Date: Sat Nov 13 00:11:15 2021 +1100
Branches: blender-v3.0-release
https://developer.blender.org/rB0ea60cf6b813f8b792a253e10a6c2edaf7fb689f
Fix gizmo protection flag use in object mode
Channel protection flags were only used in global mode,
this doesn't make any sense, especially for rotation and scale.
Follow pose-bones, only using protection flags for
local & gimbal orientation.
===================================================================
M source/blender/editors/transform/transform_gizmo_3d.c
===================================================================
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index c96852cd094..d3aaae7253e 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -1064,7 +1064,7 @@ 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 (orient_index == V3D_ORIENT_GLOBAL) {
+ if (ELEM(orient_index, V3D_ORIENT_LOCAL, V3D_ORIENT_GIMBAL)) {
protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag);
}
totsel++;
More information about the Bf-blender-cvs
mailing list