Merged changes in the trunk up to revision 52815.

[blender-staging.git] / source / blender / makesrna / intern / rna_userdef.c

diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 7be34c398aefbc8d792034293a10f9f604468bf2..59a3a8c2522a5e50bffa000b823d06cea5ff7e4c 100644 (file)
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -962,6 +962,11 @@ static void rna_def_userdef_theme_spaces_edge(StructRNA *srna)
        RNA_def_property_array(prop, 3);
        RNA_def_property_ui_text(prop, "Edge UV Face Select", "");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+       prop= RNA_def_property(srna, "freestyle_edge_mark", PROP_FLOAT, PROP_COLOR_GAMMA);
+       RNA_def_property_array(prop, 3);
+       RNA_def_property_ui_text(prop, "Freestyle Edge Mark", "");
+       RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_spaces_face(StructRNA *srna)
@@ -987,6 +992,11 @@ static void rna_def_userdef_theme_spaces_face(StructRNA *srna)
        RNA_def_property_range(prop, 1, 10);
        RNA_def_property_ui_text(prop, "Face Dot Size", "");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+       prop= RNA_def_property(srna, "freestyle_face_mark", PROP_FLOAT, PROP_COLOR_GAMMA);
+       RNA_def_property_array(prop, 4);
+       RNA_def_property_ui_text(prop, "Freestyle Face Mark", "");
+       RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_spaces_curves(StructRNA *srna, short incl_nurbs)