UI: hide status bar items when

1 files changed, 19 insertions, 1 deletions

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index c350283597e..6745f64cb88 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -832,6 +832,12 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
 			if (t->spacetype != SPACE_VIEW3D) {
 				return false;
 			}
+			else if (t->tsnap.mode & (SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID)) {
+				return false;
+			}
+			else if (!validSnap(t)) {
+				return false;
+			}
 			break;
 		}
 		case TFM_MODAL_AXIS_Z:
@@ -850,6 +856,13 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
 			}
 			break;
 		}
+		case TFM_MODAL_CONS_OFF:
+		{
+			if ((t->con.mode & CON_APPLY) == 0) {
+				return false;
+			}
+			break;
+		}
 		case TFM_MODAL_EDGESLIDE_UP:
 		case TFM_MODAL_EDGESLIDE_DOWN:
 		{
@@ -873,7 +886,6 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
 			}
 			break;
 		}
-
 	}
 	return true;
 }
@@ -1613,6 +1625,12 @@ int transformEvent(TransInfo *t, const wmEvent *event)
 		handled = true;
 	}
 
+	if (t->redraw &&
+	    !ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE))
+	{
+		WM_window_status_area_tag_redraw(CTX_wm_window(t->context));
+	}
+
 	if (handled || t->redraw) {
 		return 0;
 	}