[Bf-blender-cvs] [f27449d117c] blender2.8: Fix T55920: viewport "navigate" shows on transform

[Campbell Barton]

Commit: f27449d117c616183732293e62ee099320f23585
Author: Campbell Barton
Date:   Fri Jul 13 10:00:36 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf27449d117c616183732293e62ee099320f23585

Fix T55920: viewport "navigate" shows on transform

===================================================================

M	source/blender/editors/mesh/editmesh_bevel.c
M	source/blender/editors/mesh/editmesh_bisect.c
M	source/blender/editors/mesh/editmesh_inset.c
M	source/blender/editors/transform/transform_generics.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 2b6f8914a02..58246a60362 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -202,7 +202,7 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 
 		if (v3d) {
 			opdata->mpr_flag = v3d->mpr_flag;
-			v3d->mpr_flag = 0;
+			v3d->mpr_flag = V3D_MANIPULATOR_HIDE;
 		}
 	}
 
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index ee8adeb2c52..579cd5e4e08 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -157,7 +157,7 @@ static int mesh_bisect_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		/* misc other vars */
 		G.moving = G_TRANSFORM_EDIT;
 		opdata->mpr_flag = v3d->mpr_flag;
-		v3d->mpr_flag = 0;
+		v3d->mpr_flag = V3D_MANIPULATOR_HIDE;
 
 		/* initialize modal callout */
 		ED_workspace_status_text(C, IFACE_("LMB: Click and drag to draw cut line"));
diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c
index 251e328ee84..1f1d2f5a2e1 100644
--- a/source/blender/editors/mesh/editmesh_inset.c
+++ b/source/blender/editors/mesh/editmesh_inset.c
@@ -174,7 +174,7 @@ static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 		G.moving = G_TRANSFORM_EDIT;
 		if (v3d) {
 			opdata->mpr_flag = v3d->mpr_flag;
-			v3d->mpr_flag = 0;
+			v3d->mpr_flag = V3D_MANIPULATOR_HIDE;
 		}
 	}
 
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 303fa26bd4a..c79c28a99da 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1351,7 +1351,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 		/* turn manipulator off during transform */
 		if (t->flag & T_MODAL) {
 			t->mpr_flag = v3d->mpr_flag;
-			v3d->mpr_flag = 0;
+			v3d->mpr_flag = V3D_MANIPULATOR_HIDE;
 		}
 
 		if (t->scene->toolsettings->transform_flag & SCE_XFORM_AXIS_ALIGN) {