Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-06-11 15:27:18 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-06-11 15:27:18 +0300
commitf58b97a45758c828675543335f78bbfc82f67b31 (patch)
treec20fba58fc74b4fdff0d6445f089df96effcf4c4
parent4419dd3bfd00906f9f0f174f083d3490c27b01f8 (diff)
Documentation: Update description with documentation
m---------release/datafiles/locale0
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py2
-rw-r--r--source/blender/makesrna/intern/rna_space.c25
5 files changed, 11 insertions, 16 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject ad82c4ce43ef2801ef51e75af1f9702992478b0
+Subproject d1f85e37b7fa2574243a112670fd36fbebc61d4
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 8e6f485cf5b160c425d7da7c743879b20f3d6a9
+Subproject 290ed760cb83079f7889fafab8f7bb7383736d5
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 7077ff07384491d1f7630484995557f1c7302da
+Subproject 929e9e75703444689704cad809f5af1ffad6c9b
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index bc1192cd223..8c34dfd5f20 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4995,7 +4995,7 @@ class VIEW3D_PT_object_type_visibility(Panel):
("curve", "Curve"),
("surf", "Surface"),
("meta", "Meta"),
- ("font", "Font"),
+ ("font", "Text"),
("grease_pencil", "Grease Pencil"),
(None, None),
# Other
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 911035c5521..84955c69ee0 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3239,23 +3239,22 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_floor", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_FLOOR);
- RNA_def_property_ui_text(
- prop, "Display Grid Floor", "Show the ground plane grid in perspective view");
+ RNA_def_property_ui_text(prop, "Display Grid Floor", "Show the ground plane grid");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_axis_x", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_X);
- RNA_def_property_ui_text(prop, "Display X Axis", "Show the X axis line in perspective view");
+ RNA_def_property_ui_text(prop, "Display X Axis", "Show the X axis line");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_axis_y", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_Y);
- RNA_def_property_ui_text(prop, "Display Y Axis", "Show the Y axis line in perspective view");
+ RNA_def_property_ui_text(prop, "Display Y Axis", "Show the Y axis line");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_axis_z", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_Z);
- RNA_def_property_ui_text(prop, "Display Z Axis", "Show the Z axis line in perspective view");
+ RNA_def_property_ui_text(prop, "Display Z Axis", "Show the Z axis line");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "grid_scale", PROP_FLOAT, PROP_NONE);
@@ -3290,9 +3289,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_outline_selected", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_SELECT_OUTLINE);
RNA_def_property_ui_text(
- prop,
- "Outline Selected",
- "Show an outline highlight around selected objects in non-wireframe views");
+ prop, "Outline Selected", "Show an outline highlight around selected objects");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_object_origins", PROP_BOOLEAN, PROP_NONE);
@@ -3434,20 +3431,17 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_edges", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_EDGES);
- RNA_def_property_ui_text(prop, "Draw Edges", "Display selected edges using highlights");
+ RNA_def_property_ui_text(prop, "Draw Edges", "Highlight selected edges");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_faces", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_FACES);
- RNA_def_property_ui_text(prop, "Draw Faces", "Display shading over all faces");
+ RNA_def_property_ui_text(prop, "Draw Faces", "Highlight selected faces");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_face_center", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_FACE_DOT);
- RNA_def_property_ui_text(prop,
- "Draw Face Center",
- "Display face center "
- "(when disabled, edges display wider in edge mode)");
+ RNA_def_property_ui_text(prop, "Draw Face Center", "Display face center");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_edge_crease", PROP_BOOLEAN, PROP_NONE);
@@ -3843,7 +3837,8 @@ static void rna_def_space_view3d(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_gizmo_light_look_at", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gizmo_show_light", V3D_GIZMO_SHOW_LIGHT_LOOK_AT);
- RNA_def_property_ui_text(prop, "Show Light Look-At", "Gizmo to adjust spot and area size");
+ RNA_def_property_ui_text(
+ prop, "Show Light Look-At", "Gizmo to adjust the direction of the light");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
/* Camera Object Data. */