archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Hide transform widget when tool widget is used

Browse Source
This commit is contained in:
Campbell Barton
2017-10-27 15:54:17 +11:00
parent de7544202a
commit 9ab67fd31b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/transform/transform_manipulator.c
View File

@@ -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)