Merged changes in the trunk up to revision 55357.
[blender.git] / source / blender / editors / include / UI_resources.h
index 0086ef0..2ac66fb 100644 (file)
@@ -207,6 +207,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 */