Merged changes in the trunk up to revision 54110.
[blender.git] / source / blender / editors / include / UI_resources.h
index f8eae840471a09158c8f23ef605550a91b6112df..df07e05ec067e5d4994a4ad4370ac7acc0b80cc7 100644 (file)
@@ -205,6 +205,11 @@ enum {
        TH_STITCH_PREVIEW_UNSTITCHABLE,
        TH_STITCH_PREVIEW_ACTIVE,
 
+/* #ifdef WITH_FREESTYLE */
+       TH_FREESTYLE_EDGE_MARK,
+       TH_FREESTYLE_FACE_MARK,
+/* #endif */
+
        TH_MATCH,           /* highlight color for search matches */
        TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */