[Bf-blender-cvs] [e07e8e3] master: Fix T38166: Vertex slide C key doesn't work

Campbell Barton noreply at git.blender.org
Wed Jan 15 08:37:44 CET 2014


Commit: e07e8e31bb549ab654e18e6801b41b8919bffb00
Author: Campbell Barton
Date:   Wed Jan 15 18:27:39 2014 +1100
https://developer.blender.org/rBe07e8e31bb549ab654e18e6801b41b8919bffb00

Fix T38166: Vertex slide C key doesn't work

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

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

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 2fa28b3..a73063f 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1358,23 +1358,29 @@ int transformEvent(TransInfo *t, const wmEvent *event)
 				break;
 			case CKEY:
 				if (event->alt) {
-					t->flag ^= T_PROP_CONNECTED;
-					sort_trans_data_dist(t);
-					calculatePropRatio(t);
-					t->redraw = TREDRAW_HARD;
-					handled = true;
+					if (!(t->options & CTX_NO_PET)) {
+						t->flag ^= T_PROP_CONNECTED;
+						sort_trans_data_dist(t);
+						calculatePropRatio(t);
+						t->redraw = TREDRAW_HARD;
+						handled = true;
+					}
 				}
 				else {
-					stopConstraint(t);
-					t->redraw |= TREDRAW_HARD;
-					handled = true;
+					if (!(t->flag & T_NO_CONSTRAINT)) {
+						stopConstraint(t);
+						t->redraw |= TREDRAW_HARD;
+						handled = true;
+					}
 				}
 				break;
 			case XKEY:
 			case YKEY:
 			case ZKEY:
-				transform_event_xyz_constraint(t, event->type, cmode);
-				handled = true;
+				if (!(t->flag & T_NO_CONSTRAINT)) {
+					transform_event_xyz_constraint(t, event->type, cmode);
+					handled = true;
+				}
 				break;
 			case OKEY:
 				if (t->flag & T_PROP_EDIT && event->shift) {




More information about the Bf-blender-cvs mailing list