[Bf-blender-cvs] [07e368cb5f6] blender2.8: UI: hide status bar constraints when not used

Campbell Barton noreply at git.blender.org
Mon Jul 9 18:26:29 CEST 2018


Commit: 07e368cb5f6a4f73164a70794e884970d171d909
Author: Campbell Barton
Date:   Mon Jul 9 18:25:25 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB07e368cb5f6a4f73164a70794e884970d171d909

UI: hide status bar constraints when not used

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

M	source/blender/editors/transform/transform.c

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 6745f64cb88..1f2589d8a0c 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -840,20 +840,21 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
 			}
 			break;
 		}
+		case TFM_MODAL_AXIS_X:
+		case TFM_MODAL_AXIS_Y:
 		case TFM_MODAL_AXIS_Z:
-		{
-			if (t->flag & T_2D_EDIT) {
-				return false;
-			}
-			break;
-		}
 		case TFM_MODAL_PLANE_X:
 		case TFM_MODAL_PLANE_Y:
 		case TFM_MODAL_PLANE_Z:
 		{
-			if (t->flag & T_2D_EDIT) {
+			if (t->flag & T_NO_CONSTRAINT) {
 				return false;
 			}
+			if (!ELEM(value, TFM_MODAL_AXIS_X, TFM_MODAL_AXIS_Y)) {
+				if (t->flag & T_2D_EDIT) {
+					return false;
+				}
+			}
 			break;
 		}
 		case TFM_MODAL_CONS_OFF:



More information about the Bf-blender-cvs mailing list