Merge remote-tracking branch 'origin/master' into blender2.8

[blender.git] / source / blender / makesrna / intern / rna_sculpt_paint.c

diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 305b4aa1b6e1be8771549433ccdf2d107361532f..edc7324d3fd43f5d121a1654137fd265491bf3c8 100644 (file)
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -64,6 +64,14 @@ EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[] = {
        { 0, NULL, 0, NULL, NULL }
 };
 
+EnumPropertyItem rna_enum_gpencil_lockaxis_items[] = {
+       { GP_LOCKAXIS_NONE, "GP_LOCKAXIS_NONE", 0, "None", "" },
+       { GP_LOCKAXIS_X, "GP_LOCKAXIS_X", 0, "X", "Project strokes to plane locked to X" },
+       { GP_LOCKAXIS_Y, "GP_LOCKAXIS_Y", 0, "Y", "Project strokes to plane locked to Y" },
+       { GP_LOCKAXIS_Z, "GP_LOCKAXIS_Z", 0, "Z", "Project strokes to plane locked to Z" },
+       { 0, NULL, 0, NULL, NULL }
+};
+
 EnumPropertyItem rna_enum_symmetrize_direction_items[] = {
        {BMO_SYMMETRIZE_NEGATIVE_X, "NEGATIVE_X", 0, "-X to +X", ""},
        {BMO_SYMMETRIZE_POSITIVE_X, "POSITIVE_X", 0, "+X to -X", ""},
@@ -734,6 +742,13 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Alpha", "Alpha value for selected vertices");
        RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, "rna_GPencil_update");
 
+       /* lock axis */
+       prop = RNA_def_property(srna, "lockaxis", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "lock_axis");
+       RNA_def_property_enum_items(prop, rna_enum_gpencil_lockaxis_items);
+       RNA_def_property_ui_text(prop, "Lock", "");
+       RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
+
        /* brush */
        srna = RNA_def_struct(brna, "GPencilSculptBrush", NULL);
        RNA_def_struct_sdna(srna, "GP_EditBrush_Data");