Added support for three types of stroke caps that determines the shape

of both ends of strokes.  The three cap types are: 1) butt caps (flat);
2) round caps (half-circle); and 3) square caps (flat and extended).
Also implemented an option to join those feature edges of the same
object.  These options are available in the "Stroke" tab of the
"Freestyle: Line Style" panel in the Render buttons.

1 files changed, 8 insertions, 3 deletions

diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h
index a04cbb8c79d..3deef684e3d 100644
--- a/source/blender/makesdna/DNA_linestyle_types.h
+++ b/source/blender/makesdna/DNA_linestyle_types.h
@@ -179,7 +179,13 @@ typedef struct LineStyleThicknessModifier_DistanceFromObject {
 #define LS_PANEL_MISC         6
 
 /* FreestyleLineStyle::flag */
-#define LS_DS_EXPAND 1 /* for animation editors */
+#define LS_DS_EXPAND    1 /* for animation editors */
+#define LS_SAME_OBJECT  2
+
+/* FreestyleLineStyle::caps */
+#define LS_CAPS_BUTT    1
+#define LS_CAPS_ROUND   2
+#define LS_CAPS_SQUARE  3
 
 typedef struct FreestyleLineStyle {
 	ID id;
@@ -187,9 +193,8 @@ typedef struct FreestyleLineStyle {
 
 	float r, g, b, alpha;
 	float thickness;
-	int flag;
+	int flag, caps;
 	int panel; /* for UI */
-	int pad1;
 
 	ListBase color_modifiers;
 	ListBase alpha_modifiers;