Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-07-13 11:00:36 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-13 11:00:36 +0300
commitf27449d117c616183732293e62ee099320f23585 (patch)
tree9acc8e8c96e84632ca5d7a8352db64d1ffe96f37 /source/blender
parentb2d8f834446c5545efae8a824a6197e2b338ec00 (diff)
Fix T55920: viewport "navigate" shows on transform
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/mesh/editmesh_bevel.c2
-rw-r--r--source/blender/editors/mesh/editmesh_bisect.c2
-rw-r--r--source/blender/editors/mesh/editmesh_inset.c2
-rw-r--r--source/blender/editors/transform/transform_generics.c2
4 files changed, 4 insertions, 4 deletions
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) {