diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-27 07:54:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-27 07:54:17 +0300 |
| commit | 9ab67fd31bc5b84034deddd6487343d45c2ba1d7 (patch) | |
| tree | f35b9558737e2c08049ce92e0704fa8f6d54abac /source/blender/editors/transform | |
| parent | de7544202ab968b1e9b6c529b09bc2616e0f4f00 (diff) | |
Hide transform widget when tool widget is used
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 1fa62556bd5..d1f17ac7cb2 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1441,8 +1441,16 @@ static bool WIDGETGROUP_manipulator_poll(const struct bContext *C, struct wmMani const ScrArea *sa = CTX_wm_area(C); const View3D *v3d = sa->spacedata.first; - return (((v3d->twflag & V3D_MANIPULATOR_DRAW) != 0) && - ((v3d->twtype & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE | V3D_MANIP_SCALE)) != 0)); + if (((v3d->twflag & V3D_MANIPULATOR_DRAW) != 0) && + ((v3d->twtype & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE | V3D_MANIP_SCALE)) != 0)) + { + /* Don't show when tools have a manipulator. */ + WorkSpace *workspace = CTX_wm_workspace(C); + if (workspace->tool.manipulator_group[0] == '\0') { + return true; + } + } + return false; } void TRANSFORM_WGT_manipulator(wmManipulatorGroupType *wgt) |