Fix T55920: viewport "navigate" shows on transform
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 08:00:36 +0000 (10:00 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 08:00:36 +0000 (10:00 +0200)
source/blender/editors/mesh/editmesh_bevel.c
source/blender/editors/mesh/editmesh_bisect.c
source/blender/editors/mesh/editmesh_inset.c
source/blender/editors/transform/transform_generics.c

index 2b6f8914a02356dd5e7a87649a97addc00de3c1e..58246a60362f583a87f929a3048c5f6457059415 100644 (file)
@@ -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;
                }
        }
 
index ee8adeb2c52c7fbb24c4b1e5c2fec2b5b38924b9..579cd5e4e0823af02a6c0f7f78ddc730d7f50baa 100644 (file)
@@ -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"));
index 251e328ee846c49a86914c2c7b7e3a170d619d41..1f1d2f5a2e19733a0e26b608476a2fcd05ad098a 100644 (file)
@@ -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;
                }
        }
 
index 303fa26bd4a5547795e14b2b4c12cea34d4e8eae..c79c28a99da4ad9549101839a55b528cf5b69156 100644 (file)
@@ -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) {