Bevel: remove workspace text message when exiting bevel.
authorHoward Trickey <howard.trickey@gmail.com>
Fri, 15 Feb 2019 14:15:32 +0000 (09:15 -0500)
committerHoward Trickey <howard.trickey@gmail.com>
Fri, 15 Feb 2019 14:15:32 +0000 (09:15 -0500)
The message with shortcuts was hanging around after bevel
exited.

source/blender/editors/mesh/editmesh_bevel.c

index 219437bc3fd696f5474fc230803616faa2ff39b0..7696c0a141cf1001a7735dd30fbe1bcd7be7ead4 100644 (file)
@@ -429,7 +429,6 @@ static void edbm_bevel_calc_initial_length(wmOperator *op, const wmEvent *event,
 
 static int edbm_bevel_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
-       /* TODO make modal keymap (see fly mode) */
        RegionView3D *rv3d = CTX_wm_region_view3d(C);
        BevelData *opdata;
        float center_3d[3];
@@ -456,6 +455,7 @@ static int edbm_bevel_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
        if (!edbm_bevel_calc(op)) {
                edbm_bevel_cancel(C, op);
+               ED_workspace_status_text(C, NULL);
                return OPERATOR_CANCELLED;
        }
 
@@ -605,6 +605,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
                switch (event->val) {
                        case BEV_MODAL_CANCEL:
                                edbm_bevel_cancel(C, op);
+                               ED_workspace_status_text(C, NULL);
                                return OPERATOR_CANCELLED;
 
                        case BEV_MODAL_CONFIRM:
@@ -615,6 +616,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
                                {
                                        edbm_bevel_calc(op);
                                        edbm_bevel_exit(C, op);
+                                       ED_workspace_status_text(C, NULL);
                                        return OPERATOR_FINISHED;
                                }
                                break;