Merged changes in the trunk up to revision 54802.
[blender.git] / source / blender / makesdna / DNA_userdef_types.h
index 26b337835350cae496bcce34b15520e321e279bc..0e5f0aea40150f7c728311280c6ac105f3384a2c 100644 (file)
@@ -240,6 +240,9 @@ typedef struct ThemeSpace {
        char bone_solid[4], bone_pose[4], bone_pose_active[4];
        char strip[4], strip_select[4];
        char cframe[4];
+/* #ifdef WITH_FREESTYLE */
+       char freestyle_edge_mark[4], freestyle_face_mark[4];
+/* #endif */
        
        char nurb_uline[4], nurb_vline[4];
        char act_spline[4], nurb_sel_uline[4], nurb_sel_vline[4], lastsel_point[4];