[Bf-blender-cvs] [aab881520dc] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Tue Aug 1 16:51:39 CEST 2017
Commit: aab881520dc22bb1f3ff11afaed594eca0917a55
Author: Antonio Vazquez
Date: Tue Aug 1 13:21:04 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBaab881520dc22bb1f3ff11afaed594eca0917a55
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_sculpt_paint.c
index 9e4ea88a7d7,49988f75fcc..f92aa68e601
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@@ -73,18 -76,15 +74,18 @@@ EnumPropertyItem rna_enum_gpencil_sculp
{ 0, NULL, 0, NULL, NULL }
};
- EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = {
- { GP_EDITBRUSH_TYPE_WEIGHT, "WEIGHT", ICON_GPBRUSH_WEIGHT, "Weight", "Weight Paint for Vertex Groups" },
- { 0, NULL, 0, NULL, NULL }
- };
+ #ifndef RNA_RUNTIME
+ static 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_gpencil_lockaxis_items[] = {
- { GP_LOCKAXIS_NONE, "GP_LOCKAXIS_NONE", ICON_UNLOCKED, "", "Strokes unlocked" },
- { GP_LOCKAXIS_X, "GP_LOCKAXIS_X", ICON_NDOF_DOM, "X", "Project strokes to plane locked to X" },
- { GP_LOCKAXIS_Y, "GP_LOCKAXIS_Y", ICON_NDOF_DOM, "Y", "Project strokes to plane locked to Y" },
- { GP_LOCKAXIS_Z, "GP_LOCKAXIS_Z", ICON_NDOF_DOM, "Z", "Project strokes to plane locked to Z" },
- { 0, NULL, 0, NULL, NULL }
++static EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = {
++ { GP_EDITBRUSH_TYPE_WEIGHT, "WEIGHT", ICON_GPBRUSH_WEIGHT, "Weight", "Weight Paint for Vertex Groups" },
++ { 0, NULL, 0, NULL, NULL }
};
+ #endif
EnumPropertyItem rna_enum_symmetrize_direction_items[] = {
{BMO_SYMMETRIZE_NEGATIVE_X, "NEGATIVE_X", 0, "-X to +X", ""},
More information about the Bf-blender-cvs
mailing list