More on the new GUI for the Parameter Editor mode. This is a WIP commit.

* Moved render layer-specific Freestyle options to a separate "Freestyle"
tab (in addition to the "Freestyle: Line Style" tab that has been introduced
in the previous commit).

* Added UI controls for specifying feature edge selection criteria in the
Parameter Editor mode.  Feature edge selection starts with a set of all
feature edges in the view map.  Each line set specifies edge selection
criteria (e.g., to select only visible crease edges) by enabling appropriate
UI controls (e.g., by turning on the "Crease" and "Visibility" toggle
buttons).  Selected criteria are combined by logical conjunction.  Logical
disjunction (e.g., "crease edges or contours") is represented by two or
more line sets.

* Slightly rearranged several UI controls in the Python Scripting mode.

1 files changed, 25 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h
index 8444f6bd29a..2fcfdd40cf6 100644
--- a/source/blender/makesdna/DNA_freestyle_types.h
+++ b/source/blender/makesdna/DNA_freestyle_types.h
@@ -17,6 +17,23 @@
 #define FREESTYLE_LINESET_CURRENT  1
 #define FREESTYLE_LINESET_ENABLED  2
 
+/* FreestyleLineSet::selection */
+#define FREESTYLE_SEL_SILHOUETTE          1
+#define FREESTYLE_SEL_BORDER              2
+#define FREESTYLE_SEL_CREASE              4
+#define FREESTYLE_SEL_RIDGE               8
+#define FREESTYLE_SEL_VALLEY              16
+#define FREESTYLE_SEL_SUGGESTIVE_CONTOUR  32
+#define FREESTYLE_SEL_MATERIAL_BOUNDARY   64
+#define FREESTYLE_SEL_CONTOUR             128
+#define FREESTYLE_SEL_EXTERNAL_CONTOUR    256
+#define FREESTYLE_SEL_VISIBILITY          512
+
+/* FreestyleLineSet::qi */
+#define FREESTYLE_QI_VISIBLE  1
+#define FREESTYLE_QI_HIDDEN   2
+#define FREESTYLE_QI_RANGE    3
+
 typedef struct FreestyleLineStyle {
 	ID id;
 
@@ -27,7 +44,14 @@ typedef struct FreestyleLineSet {
 
 	char name[32]; /* line set name */
 	int flags;
-	int pad;
+	int selection; /* feature edge selection */
+
+	float crease_angle;
+	float sphere_radius;
+	float dkr_epsilon;
+	short qi; /* quantitative invisibility */
+	short pad;
+	int qi_start, qi_end;
 
 	FreestyleLineStyle *linestyle; /* line style */