blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

GP: Guides: Fix bug with Mkey and Circular guides 

Reported by @pepeland.

Adding missing events on the first point was breaking the guide behaviour.
Also, updated Ckey so it always defaults to Circular mode when guides are off.
This commit is contained in:
Charlie Jolly 2019-01-18 15:50:16 +00:00
parent b5bc2158a0
commit 985dcbf6db
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -3069,8 +3069,11 @@ static void gpencil_guide_event_handling(bContext *C, wmOperator *op, const wmEv
/* Point guide */
else if ((event->type == CKEY) && (event->val == KM_RELEASE)) {
add_notifier = true;
guide->use_guide = true;
if (guide->type == GP_GUIDE_CIRCULAR) {
if (!guide->use_guide) {
guide->use_guide = true;
guide->type = GP_GUIDE_CIRCULAR;
}
else if (guide->type == GP_GUIDE_CIRCULAR) {
guide->type = GP_GUIDE_RADIAL;
}
else if (guide->type == GP_GUIDE_RADIAL) {
@ -3632,7 +3635,9 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
/* handle drawing event */
/* printf("\t\tGP - add point\n"); */
gpencil_add_missing_events(C, op, event, p);
if ((!(p->flags & GP_PAINTFLAG_FIRSTRUN)) && guide->use_guide) {
gpencil_add_missing_events(C, op, event, p);
}
gpencil_draw_apply_event(C, op, event, CTX_data_depsgraph(C), 0.0f, 0.0f);