Fine control of feature edge selection with mesh face and edge marks.

New "face marks" and "edge marks" have been introduced in mesh data
blocks.  In the edit mode of a mesh object, face marks can be put
to selected faces by choosing Mesh >> Faces >> Mark Freestyle Face
from the menu of a 3D View window or Ctrl-F >> Mark Freestyle Face
from the context menu.  Similarly, edge marks can be put to selected
edges by Mesh >> Edges >> Mark Freestyle Edge or Ctrl-E >> Mark
Freestyle Edge.  These marks should work fine with the Subdivision
surface modifier.

Moreover, two new conditions for feature edge selection have been
added to the Parameter Editor mode as described below:

1. The Selection by Edge Types option has now the new Edge Mark type,
which can be used to (de)select feature edges having edge marks.
This option can be used to add to (or remove from) the view map
arbitrary edges of mesh objects.

2. Selection by Face Marks option has been newly introduced, in which
face marks are used for feature edge selection in two ways.  One
option is called "One Face" which is to (de)select feature edges if
one of faces on the left and right of each feature edge has a face
mark.  The other option is "Both Faces" to (de)select feature edges
if both faces on the left and right have a face mark.

1 files changed, 4 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h
index 3eec6a97172..08b4f406223 100644
--- a/source/blender/makesdna/DNA_freestyle_types.h
+++ b/source/blender/makesdna/DNA_freestyle_types.h
@@ -51,12 +51,15 @@ struct FreestyleLineStyle;
 #define FREESTYLE_LINESET_FE_NOT   4
 #define FREESTYLE_LINESET_FE_AND   8
 #define FREESTYLE_LINESET_GR_NOT   16
+#define FREESTYLE_LINESET_FM_NOT   32
+#define FREESTYLE_LINESET_FM_BOTH  64
 
 /* FreestyleLineSet::selection */
 #define FREESTYLE_SEL_VISIBILITY    1
 #define FREESTYLE_SEL_EDGE_TYPES    2
 #define FREESTYLE_SEL_GROUP         4
 #define FREESTYLE_SEL_IMAGE_BORDER  8
+#define FREESTYLE_SEL_FACE_MARK     16
 
 /* FreestyleLineSet::fedge_types */
 #define FREESTYLE_FE_SILHOUETTE          1
@@ -68,6 +71,7 @@ struct FreestyleLineStyle;
 #define FREESTYLE_FE_MATERIAL_BOUNDARY   64
 #define FREESTYLE_FE_CONTOUR             128
 #define FREESTYLE_FE_EXTERNAL_CONTOUR    512
+#define FREESTYLE_FE_EDGE_MARK           1024
 
 /* FreestyleLineSet::qi */
 #define FREESTYLE_QI_VISIBLE  1