Freestyle: New options for sorting to arrange the stacking order of lines.

Line styles now have a set of new options for rearranging the stacking order of lines.
This gives artists more control to determine which lines should be drawn on top of others.
Two available sort keys are the distance from camera and curvilinear 2D length.
Since the distance of a line from camera may vary over vertices, another option called
integration type is used to compute the sort key for a line from the values computed at
individual vertices.  Available integration types are MEAN, MIN, MAX, FIRST and LAST
(see the tool tips for more detail).

2 files changed, 16 insertions, 2 deletions

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 2dd227ef036..41b95064ac6 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -43,6 +43,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_sdna_types.h"
+#include "DNA_linestyle_types.h"
 
 #include "DNA_genfile.h"
 
@@ -171,4 +172,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			me->smoothresh = DEG2RADF(me->smoothresh);
 		}
 	}
+
+	if (!MAIN_VERSION_ATLEAST(main, 270, 3)) {
+		FreestyleLineStyle *linestyle;
+
+		for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+			linestyle->flag |= LS_NO_SORTING;
+			linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA;
+			linestyle->integration_type = LS_INTEGRATION_MEAN;
+		}
+	}
 }
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index d6caf16f7aa..b455ef016b2 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -59,8 +59,11 @@ void BLO_update_defaults_startup_blend(Main *main)
 		}
 	}
 
-	for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next)
-		linestyle->flag = LS_SAME_OBJECT;
+	for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+		linestyle->flag = LS_SAME_OBJECT | LS_NO_SORTING;
+		linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA;
+		linestyle->integration_type = LS_INTEGRATION_MEAN;
+	}
 
 	{
 		bScreen *screen;