[Bf-blender-cvs] [73dd9c4d34a] blender2.8: Fix string formatting, fall through attr

Campbell Barton noreply at git.blender.org
Sat Dec 15 23:25:27 CET 2018


Commit: 73dd9c4d34aec6169ecac180429ec009124537a9
Author: Campbell Barton
Date:   Sun Dec 16 09:23:07 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB73dd9c4d34aec6169ecac180429ec009124537a9

Fix string formatting, fall through attr

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

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 0e4f9558842..f067ff167fc 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -415,26 +415,26 @@ static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi
 		else {
 			if (tgpi->flag == IN_PROGRESS) {
 				BLI_snprintf(
-					status_str, sizeof(status_str), "%s: %d (%d, %d) (%d, %d)", msg_str, (int)tgpi->tot_edges,
-					tgpi->start[0], tgpi->start[1], tgpi->end[0], tgpi->end[1]);
+				        status_str, sizeof(status_str), "%s: %d (%d, %d) (%d, %d)", msg_str, tgpi->tot_edges,
+				        (int)tgpi->start[0], (int)tgpi->start[1], (int)tgpi->end[0], (int)tgpi->end[1]);
 			}
 			else {
 				BLI_snprintf(
-					status_str, sizeof(status_str), "%s: %d (%d, %d)", msg_str, (int)tgpi->tot_edges,
-					tgpi->end[0], tgpi->end[1]);
+				        status_str, sizeof(status_str), "%s: %d (%d, %d)", msg_str, tgpi->tot_edges,
+				        (int)tgpi->end[0], (int)tgpi->end[1]);
 			}
 		}
 	}
 	else {
 		if (tgpi->flag == IN_PROGRESS) {
 			BLI_snprintf(
-				status_str, sizeof(status_str), "%s: %d (%d, %d) (%d, %d)", msg_str, (int)tgpi->tot_edges,
-				tgpi->start[0], tgpi->start[1], tgpi->end[0], tgpi->end[1]);
+			        status_str, sizeof(status_str), "%s: %d (%d, %d) (%d, %d)", msg_str, tgpi->tot_edges,
+			        (int)tgpi->start[0], (int)tgpi->start[1], (int)tgpi->end[0], (int)tgpi->end[1]);
 		}
 		else {
 			BLI_snprintf(
-				status_str, sizeof(status_str), "%s: (%d, %d)", msg_str,
-				tgpi->end[0], tgpi->end[1]);
+			        status_str, sizeof(status_str), "%s: (%d, %d)", msg_str,
+			        (int)tgpi->end[0], (int)tgpi->end[1]);
 		}
 	}
 	ED_workspace_status_text(C, status_str);
@@ -1366,6 +1366,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
 				/* done! */
 				return OPERATOR_FINISHED;
 			}
+			ATTR_FALLTHROUGH;
 		}
 		case ESCKEY:
 		{



More information about the Bf-blender-cvs mailing list