[Bf-blender-cvs] [56a829145b1] greasepencil-object: GP: Guides: Change keys to release event

Charlie Jolly noreply at git.blender.org
Tue Jan 8 01:41:10 CET 2019


Commit: 56a829145b1c60847cda0456a9419acb30841af0
Author: Charlie Jolly
Date:   Tue Jan 8 00:41:02 2019 +0000
Branches: greasepencil-object
https://developer.blender.org/rB56a829145b1c60847cda0456a9419acb30841af0

GP: Guides: Change keys to release event

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

M	source/blender/editors/gpencil/gpencil_paint.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 22e54f4e02f..fb2f1b529d2 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2954,12 +2954,12 @@ static void gpencil_guide_event_handling(bContext *C, wmOperator *op, const wmEv
 		}
 	}
 	/* Freehand mode, turn off speed guide */
-	else if ((event->type == VKEY) && (event->val == KM_PRESS)) {
+	else if ((event->type == VKEY) && (event->val == KM_RELEASE)) {
 		guide->use_guide = false;
 		add_notifier = true;
 	}
 	/* Alternate or flip direction */
-	else if ((event->type == MKEY) && (event->val == KM_PRESS)) {
+	else if ((event->type == MKEY) && (event->val == KM_RELEASE)) {
 		if (guide->type == GP_GUIDE_CIRCULAR) {
 			add_notifier = true;
 			guide->type = GP_GUIDE_RADIAL;
@@ -2978,7 +2978,7 @@ static void gpencil_guide_event_handling(bContext *C, wmOperator *op, const wmEv
 		}
 	}
 	/* Line guides */
-	else if ((event->type == LKEY) && (event->val == KM_PRESS)) {
+	else if ((event->type == LKEY) && (event->val == KM_RELEASE)) {
 		add_notifier = true;
 		guide->use_guide = true;		
 		if (event->ctrl) {
@@ -2994,7 +2994,7 @@ static void gpencil_guide_event_handling(bContext *C, wmOperator *op, const wmEv
 		}
 	}
 	/* Point guide */
-	else if ((event->type == CKEY) && (event->val == KM_PRESS)) {
+	else if ((event->type == CKEY) && (event->val == KM_RELEASE)) {
 		add_notifier = true;
 		guide->use_guide = true;
 		if (guide->type == GP_GUIDE_CIRCULAR) {
@@ -3007,8 +3007,8 @@ static void gpencil_guide_event_handling(bContext *C, wmOperator *op, const wmEv
 			guide->type = GP_GUIDE_CIRCULAR;
 		}
 	}
-	/* Change line angle xxx maybe use LEFTBRACKETKEY & RIGHTBRACKETKEY */
-	else if (ELEM(event->type, LEFTBRACKETKEY, RIGHTBRACKETKEY) && (event->val == KM_PRESS)) {
+	/* Change line angle  */
+	else if (ELEM(event->type, JKEY, KKEY) && (event->val == KM_RELEASE)) {
 		add_notifier = true;
 		float angle = guide->angle;
 		float adjust = (float)M_PI / 180.0f;
@@ -3016,7 +3016,7 @@ static void gpencil_guide_event_handling(bContext *C, wmOperator *op, const wmEv
 			adjust *= 45.0f;
 		else if (!event->shift)
 			adjust *= 15.0f;
-		angle += (event->type == RIGHTBRACKETKEY) ? adjust : -adjust;
+		angle += (event->type == JKEY) ? adjust : -adjust;
 		angle = angle_compat_rad(angle, M_PI);
 		guide->angle = angle;
 	}



More information about the Bf-blender-cvs mailing list