blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Pablo Vazquez 2021-05-09 01:52:33 +02:00
parent 9569a522f2 3c7b80ae2c
commit b7afb8ea70
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/object/object_add.c
View File

@ -1338,6 +1338,7 @@ static int object_gpencil_add_exec(bContext *C, wmOperator *op)
break;
}
case GP_LRT_OBJECT:
case GP_LRT_SCENE:
case GP_LRT_COLLECTION: {
ob_name = "Line Art";
break;

10
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@ -68,6 +68,11 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = {
ICON_MOD_BUILD,
"Build",
"Create duplication of strokes"},
{eGpencilModifierType_Lineart,
"GP_LINEART",
ICON_MOD_EDGESPLIT, /* TODO: Use a proper icon. */
"Line Art",
"Generate line art strokes from selected source"},
{eGpencilModifierType_Mirror,
"GP_MIRROR",
ICON_MOD_MIRROR,
@ -88,11 +93,6 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = {
ICON_MOD_SUBSURF,
"Subdivide",
"Subdivide stroke adding more control points"},
{eGpencilModifierType_Lineart,
"GP_LINEART",
ICON_MOD_EDGESPLIT, /* TODO: Use a proper icon. */
"Line Art",
"Generate line art strokes from selected source"},
{0, "", 0, N_("Deform"), ""},
{eGpencilModifierType_Armature,
"GP_ARMATURE",