svn merge ^/trunk/blender -r55815:55840
[blender-staging.git] / source / blender / bmesh / intern / bmesh_operators.h
index 2063ab49169128d440bf95a7603a2474ae8bdbcc..ff0fc285dc341acaffca0a18413deaa247022010 100644 (file)
@@ -60,7 +60,10 @@ enum {
        SIMFACE_SIDES,
        SIMFACE_PERIMETER,
        SIMFACE_NORMAL,
-       SIMFACE_COPLANAR
+       SIMFACE_COPLANAR,
+#ifdef WITH_FREESTYLE
+       SIMFACE_FREESTYLE
+#endif
 };
 
 /* similar edge selection slot values */
@@ -72,7 +75,10 @@ enum {
        SIMEDGE_CREASE,
        SIMEDGE_BEVEL,
        SIMEDGE_SEAM,
-       SIMEDGE_SHARP
+       SIMEDGE_SHARP,
+#ifdef WITH_FREESTYLE
+       SIMEDGE_FREESTYLE
+#endif
 };
 
 /* similar vertex selection slot values */