archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: Cleanup typos and minor tweaks to Grease Pencil related text

Browse Source 
First pass on adding articles, capitalize Grease Pencil, use 'keyframes' instead of 'frames' when
possible, and other minor adjustments.
This commit is contained in:
Pablo Vazquez
2018-10-30 19:54:25 +01:00
parent 603774c1eb
commit 10caf398b3
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1029,8 +1029,8 @@ static int object_gpencil_add_exec(bContext *C, wmOperator *op)
void OBJECT_OT_gpencil_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add GPencil";
ot->description = "Add a grease pencil object to the scene";
ot->name = "Add Grease Pencil";
ot->description = "Add a Grease Pencil object to the scene";
ot->idname = "OBJECT_OT_gpencil_add";
/* api callbacks */

2
source/blender/editors/sculpt_paint/paint_ops.c
View File

@@ -133,7 +133,7 @@ static void BRUSH_OT_add_gpencil(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Drawing Brush";
ot->description = "Add brush for grease pencil";
ot->description = "Add brush for Grease Pencil";
ot->idname = "BRUSH_OT_add_gpencil";
/* api callbacks */

8
source/blender/editors/space_clip/tracking_ops_detect.c
View File

@@ -131,10 +131,10 @@ void CLIP_OT_detect_features(wmOperatorType *ot)
static const EnumPropertyItem placement_items[] = {
{0, "FRAME", 0, "Whole Frame",
"Place markers across the whole frame"},
{1, "INSIDE_GPENCIL", 0, "Inside grease pencil",
"Place markers only inside areas outlined with grease pencil"},
{2, "OUTSIDE_GPENCIL", 0, "Outside grease pencil",
"Place markers only outside areas outlined with grease pencil"},
{1, "INSIDE_GPENCIL", 0, "Inside Grease Pencil",
"Place markers only inside areas outlined with Grease Pencil"},
{2, "OUTSIDE_GPENCIL", 0, "Outside Grease Pencil",
"Place markers only outside areas outlined with Grease Pencil"},
{0, NULL, 0, NULL, NULL}
};

16
source/blender/makesrna/intern/rna_gpencil.c
View File

@@ -60,15 +60,15 @@ static const EnumPropertyItem parent_type_items[] = {
#ifndef RNA_RUNTIME
static EnumPropertyItem rna_enum_gpencil_xraymodes_items[] = {
{ GP_XRAY_FRONT, "FRONT", 0, "Front", "Draw all strokes in front" },
{ GP_XRAY_3DSPACE, "3DSPACE", 0, "3DSpace", "Draw strokes relative to other objects in 3D space" },
{ GP_XRAY_BACK, "BACK", 0, "Back", "Draw all strokes on back" },
{ GP_XRAY_3DSPACE, "3DSPACE", 0, "3D Space", "Draw strokes relative to other objects in 3D space" },
{ GP_XRAY_BACK, "BACK", 0, "Back", "Draw all strokes last" },
{ 0, NULL, 0, NULL, NULL }
};
static EnumPropertyItem rna_enum_gpencil_onion_modes_items[] = {
{ GP_ONION_MODE_ABSOLUTE, "ABSOLUTE", 0, "Frames", "Frames in absolute range of scene frame number" },
{ GP_ONION_MODE_RELATIVE, "RELATIVE", 0, "Keyframes", "Frames in relative range of grease pencil keyframes" },
{ GP_ONION_MODE_SELECTED, "SELECTED", 0, "Selected", "Only Selected Frames" },
{ GP_ONION_MODE_ABSOLUTE, "ABSOLUTE", 0, "Frames", "Frames in absolute range of the scene frame" },
{ GP_ONION_MODE_RELATIVE, "RELATIVE", 0, "Keyframes", "Frames in relative range of the Grease Pencil keyframes" },
{ GP_ONION_MODE_SELECTED, "SELECTED", 0, "Selected", "Only selected keyframes" },
{ 0, NULL, 0, NULL, NULL }
};
@@ -1374,7 +1374,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_onion_skinning", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_SHOW_ONIONSKINS);
RNA_def_property_ui_text(prop, "Onion Skins", "Show ghosts of the frames before and after the current frame");
RNA_def_property_ui_text(prop, "Onion Skins", "Show ghosts of the keyframes before and after the current frame");
RNA_def_property_update(prop, NC_SCREEN | NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_GPencil_update");
prop = RNA_def_property(srna, "show_stroke_direction", PROP_BOOLEAN, PROP_NONE);
@@ -1501,13 +1501,13 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "grid", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_struct_type(prop, "GreasePencilGrid");
RNA_def_property_ui_text(prop, "Grid Settings", "Settings for grid and canvas settings in the 3D viewport");
RNA_def_property_ui_text(prop, "Grid Settings", "Settings for grid and canvas in the 3D viewport");
rna_def_gpencil_grid(brna);
/* API Functions */
func = RNA_def_function(srna, "clear", "rna_GPencil_clear");
RNA_def_function_ui_description(func, "Remove all the grease pencil data");
RNA_def_function_ui_description(func, "Remove all the Grease Pencil data");
}
/* --- */

8
source/blender/makesrna/intern/rna_space.c
View File

@@ -2969,7 +2969,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "overlay.gpencil_grid_opacity");
RNA_def_property_range(prop, 0.1f, 1.0f);
RNA_def_property_float_default(prop, 0.9f);
RNA_def_property_ui_text(prop, "Opacity", "Grid opacity");
RNA_def_property_ui_text(prop, "Opacity", "Canvas grid opacity");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
/* Paper opacity factor */
@@ -2992,18 +2992,18 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
/* show edit lines */
prop = RNA_def_property(srna, "use_gpencil_edit_lines", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gp_flag", V3D_GP_SHOW_EDIT_LINES);
RNA_def_property_ui_text(prop, "Edit Lines", "Show edit lines when edit strokes");
RNA_def_property_ui_text(prop, "Show Edit Lines", "Show edit lines when editing strokes");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_GPencil_update");
prop = RNA_def_property(srna, "use_gpencil_multiedit_line_only", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gp_flag", V3D_GP_SHOW_MULTIEDIT_LINES);
RNA_def_property_ui_text(prop, "Lines Only", "Show only edit lines for additional frames");
RNA_def_property_ui_text(prop, "Lines Only", "Only show edit lines for additional frames");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_GPencil_update");
/* main grease pencil onion switch */
prop = RNA_def_property(srna, "use_gpencil_onion_skin", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gp_flag", V3D_GP_SHOW_ONION_SKIN);
RNA_def_property_ui_text(prop, "Onion Skins", "Show ghosts of the frames before and after the current frame");
RNA_def_property_ui_text(prop, "Onion Skins", "Show ghosts of the keyframes before and after the current frame");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_GPencil_update");
/* vertex opacity */

2
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -4025,7 +4025,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna)
prop = RNA_def_property(srna, "grease_pencil_default_color", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "gpencil_new_layer_col");
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Grease Pencil Default Color", "Color of new Grease Pencil layers");
RNA_def_property_ui_text(prop, "Annotation Default Color", "Color of new annotation layers");
/* sculpt and paint */