Fix for dashed line options not working as expected in some applications

when combined with geometry modifiers.

The problem is that users were not able to choose the time when the
dashed line options are applied.  Instead, the dashed line options were
applied only before geometry modifiers were employed.  Since dashes were
separate strokes, the geometry modifiers were processed dash by dash.
Depending on users' artistic intention, this may or may not lead to
expected stylization results, as reported by octane98 in the
BlenderArtists Freestyle thread on January 3, 2012.
http://blenderartists.org/forum/showthread.php?89986-Freestyle-for-Blender&p=2018592&viewfull=1#post2018592

Now the Strokes tab of the Freestyle Line Style panel has two sets of
dashed line options.  One is in the Splitting section of the Strokes tab
and used for splitting strokes by dashed line patterns.  The other set
is called "Dashed Line" and used to generate dashed lines based on the
strokes after the geometry modifiers are applied.  The two sets of
dashed line options are independent of each other, so that users can
enable one of them as well as both at the same time.

1 files changed, 5 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h
index 9ffb53e83b6..2507b072a2f 100644
--- a/source/blender/makesdna/DNA_linestyle_types.h
+++ b/source/blender/makesdna/DNA_linestyle_types.h
@@ -390,6 +390,7 @@ typedef struct LineStyleThicknessModifier_Calligraphy {
 #define LS_MIN_2D_ANGLE       128
 #define LS_MAX_2D_ANGLE       256
 #define LS_SPLIT_LENGTH       512
+#define LS_SPLIT_PATTERN      1024
 
 /* FreestyleLineStyle::chaining */
 #define LS_CHAINING_PLAIN    1
@@ -420,6 +421,10 @@ typedef struct FreestyleLineStyle {
 	float split_length;
 	float min_angle, max_angle; /* for splitting */
 	float min_length, max_length;
+	unsigned short split_dash1, split_gap1;
+	unsigned short split_dash2, split_gap2;
+	unsigned short split_dash3, split_gap3;
+	int pad;
 	unsigned short dash1, gap1, dash2, gap2, dash3, gap3;
 	int panel; /* for UI */