Commit: 50668ae249684d749216be0f7d682510a815602a
Author: Antonioya
Date: Sat Dec 15 12:19:43 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB50668ae249684d749216be0f7d682510a815602a
GP: Remove C key for Line primitive
It's weird to have this option in lines because mix with arcs. For Arcs and
Curves the C key is very useful.
Some changes in bottom text too.
===================================================================
M source/blender/editors/gpencil/gpencil_primitive.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c
b/source/blender/editors/gpencil/gpencil_primitive.c
index dcb4dfa038b..72b4136f26c 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -389,20 +389,20 @@ static void gpencil_primitive_status_indicators(bContext
*C, tGPDprimitive *tgpi
char status_str[UI_MAX_DRAW_STR];
char msg_str[UI_MAX_DRAW_STR];
- if (tgpi->type == GP_STROKE_BOX) {
- BLI_strncpy(msg_str, IFACE_("Rectangle: ESC/RMB to cancel, LMB
set origin, Enter/LMB to confirm, WHEEL/+- to adjust edge number, Shift to
square, Alt to center"), UI_MAX_DRAW_STR);
+ if (tgpi->type == GP_STROKE_LINE) {
+ BLI_strncpy(msg_str, IFACE_("Line: ESC to cancel, LMB set
origin, Enter/RMB to confirm, WHEEL/+- to adjust subdivision number, Shift to
align, Alt to center"), UI_MAX_DRAW_STR);
}
- else if (tgpi->type == GP_STROKE_LINE) {
- BLI_strncpy(msg_str, IFACE_("Line: ESC/RMB to cancel, LMB set
origin, Enter/LMB to confirm, WHEEL/+- to adjust edge number, Shift to align,
Alt to center"), UI_MAX_DRAW_STR);
+ else if (tgpi->type == GP_STROKE_BOX) {
+ BLI_strncpy(msg_str, IFACE_("Rectangle: ESC to cancel, LMB set
origin, Enter/RMB to confirm, WHEEL/+- to adjust subdivision number, Shift to
square, Alt to center"), UI_MAX_DRAW_STR);
+ }
+ else if (tgpi->type == GP_STROKE_CIRCLE) {
+ BLI_strncpy(msg_str, IFACE_("Circle: ESC to cancel, Enter/RMB
to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center"),
UI_MAX_DRAW_STR);
}
else if (tgpi->type == GP_STROKE_ARC) {
- BLI_strncpy(msg_str, IFACE_("Arc: ESC/RMB to cancel, Enter/LMB
to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center"),
UI_MAX_DRAW_STR);
+ BLI_strncpy(msg_str, IFACE_("Arc: ESC to cancel, Enter/RMB to
confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center"),
UI_MAX_DRAW_STR);
}
else if (tgpi->type == GP_STROKE_CURVE) {
- BLI_strncpy(msg_str, IFACE_("Curve: ESC/RMB to cancel,
Enter/LMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to
center"), UI_MAX_DRAW_STR);
- }
- else {
- BLI_strncpy(msg_str, IFACE_("Circle: ESC/RMB to cancel,
Enter/LMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to
center"), UI_MAX_DRAW_STR);
+ BLI_strncpy(msg_str, IFACE_("Curve: ESC to cancel, Enter/RMB to
confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center"),
UI_MAX_DRAW_STR);
}
if (ELEM(tgpi->type, GP_STROKE_CIRCLE, GP_STROKE_ARC, GP_STROKE_LINE,
GP_STROKE_BOX)) {
@@ -1419,7 +1419,9 @@ static int gpencil_primitive_modal(bContext *C,
wmOperator *op, const wmEvent *e
}
case CKEY: /* curve mode */
{
- if ((event->val == KM_PRESS) && !ELEM(tgpi->type,
GP_STROKE_BOX, GP_STROKE_CIRCLE)) {
+ if ((event->val == KM_PRESS) &&
+ !ELEM(tgpi->type, GP_STROKE_LINE,
GP_STROKE_BOX, GP_STROKE_CIRCLE))
+ {
switch (tgpi->type) {
case GP_STROKE_CURVE:
tgpi->type = GP_STROKE_ARC;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
