[Bf-blender-cvs] [d28d0e4416d] greasepencil-object: Merge branch 'master' into greasepencil-object

Antonioya noreply at git.blender.org
Sun Dec 23 17:09:38 CET 2018


Commit: d28d0e4416d8022b42045b6a3b246db4a4a5bf91
Author: Antonioya
Date:   Sun Dec 23 16:58:25 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd28d0e4416d8022b42045b6a3b246db4a4a5bf91

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/editors/gpencil/gpencil_intern.h
	source/blender/editors/gpencil/gpencil_primitive.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_primitive.c
index 8385274802c,0035d679018..3aa439b30a9
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@@ -409,25 -402,36 +411,39 @@@ static void gpencil_primitive_status_in
  	char msg_str[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);
+ 		BLI_strncpy(
+ 			msg_str,
+ 			IFACE_("Line: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, Shift to align, Alt to center, E: extrude"),
+ 			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);
+ 		BLI_strncpy(
+ 			msg_str,
+ 			IFACE_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB 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);
+ 		BLI_strncpy(
+ 			msg_str,
+ 			IFACE_("Circle: ESC to cancel, Enter/MMB 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 to cancel, Enter/RMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, M: Flip"), UI_MAX_DRAW_STR);
+ 		BLI_strncpy(msg_str,
+ 			IFACE_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, M: Flip, E: extrude"),
+ 			UI_MAX_DRAW_STR);
  	}
 +	else if (tgpi->type == GP_STROKE_CHORD) {
 +		BLI_strncpy(msg_str, IFACE_("Chord: ESC to cancel, Enter/RMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, M: Flip"), UI_MAX_DRAW_STR);
 +	}
  	else if (tgpi->type == GP_STROKE_CURVE) {
- 		BLI_strncpy(msg_str, IFACE_("Curve: ESC to cancel, Enter/RMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, E: extrude"), UI_MAX_DRAW_STR);
+ 		BLI_strncpy(
+ 			msg_str,
+ 			IFACE_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, E: extrude"),
+ 			UI_MAX_DRAW_STR);
  	}
  
 -	if (ELEM(tgpi->type, GP_STROKE_CIRCLE, GP_STROKE_ARC, GP_STROKE_LINE, GP_STROKE_BOX)) {
 +	if (ELEM(tgpi->type, GP_STROKE_CIRCLE, GP_STROKE_ARC, GP_STROKE_CHORD, GP_STROKE_LINE, GP_STROKE_BOX)) {
  		if (hasNumInput(&tgpi->num)) {
  			char str_offs[NUM_STR_REP_LEN];



More information about the Bf-blender-cvs mailing list