scripts/startup/bl_ui/space_userpref.py

@@ -728,7 +728,7 @@ class USERPREF_PT_viewport_display(ViewportPanel, CenterAlignMixIn, Panel):
 
         col.separator()
 
-        col.prop(view, "mini_axis_type", text="3D Viewport Axis")
+        col.prop(view, "mini_axis_type", text="3D Viewport Axes")
 
         if view.mini_axis_type == 'MINIMAL':
             col.prop(view, "mini_axis_size", text="Size")

source/blender/editors/interface/view2d_draw.cc

@@ -102,17 +102,16 @@ static float view2d_major_step_x__time(const View2D *v2d, const Scene *scene)
   for (int step = 1; step < fps; step *= 2) {
     possible_distances.append(step);
   }
-  possible_distances.append(fps);
+
-  possible_distances.append(2 * fps);
+  for (int i = 0; i <= 5; i++) {
-  possible_distances.append(5 * fps);
+    uint fac = pow(60, i);
-  possible_distances.append(10 * fps);
+    possible_distances.append(fac * fps);
-  possible_distances.append(30 * fps);
+    possible_distances.append(fac * 2 * fps);
-  possible_distances.append(60 * fps);
+    possible_distances.append(fac * 5 * fps);
-  possible_distances.append(2 * 60 * fps);
+    possible_distances.append(fac * 10 * fps);
-  possible_distances.append(5 * 60 * fps);
+    possible_distances.append(fac * 30 * fps);
-  possible_distances.append(10 * 60 * fps);
+    possible_distances.append(fac * 60 * fps);
-  possible_distances.append(30 * 60 * fps);
+  }
-  possible_distances.append(60 * 60 * fps);
 
   float distance = select_major_distance(possible_distances.data(),
                                          possible_distances.size(),

source/blender/editors/mask/mask_ops.c

@@ -1732,7 +1732,7 @@ void MASK_OT_hide_view_clear(wmOperatorType *ot)
 
   /* identifiers */
   ot->name = "Clear Restrict View";
-  ot->description = "Reveal the layer by setting the hide flag";
+  ot->description = "Reveal temporarily hidden mask layers";
   ot->idname = "MASK_OT_hide_view_clear";
 
   /* api callbacks */
@@ -1792,7 +1792,7 @@ void MASK_OT_hide_view_set(wmOperatorType *ot)
 {
   /* identifiers */
   ot->name = "Set Restrict View";
-  ot->description = "Hide the layer by setting the hide flag";
+  ot->description = "Temporarily hide mask layers";
   ot->idname = "MASK_OT_hide_view_set";
 
   /* api callbacks */

source/blender/makesrna/intern/rna_mask.c

@@ -826,7 +826,7 @@ static void rna_def_mask_splines(BlenderRNA *brna)
                                  NULL,
                                  NULL);
   RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
-  RNA_def_property_ui_text(prop, "Active Spline", "Active spline of masking layer");
+  RNA_def_property_ui_text(prop, "Active Point", "Active point of masking layer");
 }
 
 static void rna_def_maskSplinePoints(BlenderRNA *brna)

source/blender/makesrna/intern/rna_userdef.c

@@ -4794,7 +4794,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
   /* mini axis */
   static const EnumPropertyItem mini_axis_type_items[] = {
       {USER_MINI_AXIS_TYPE_NONE, "NONE", 0, "Off", ""},
-      {USER_MINI_AXIS_TYPE_MINIMAL, "MINIMAL", 0, "Simple Axis", ""},
+      {USER_MINI_AXIS_TYPE_MINIMAL, "MINIMAL", 0, "Simple Axes", ""},
       {USER_MINI_AXIS_TYPE_GIZMO, "GIZMO", 0, "Interactive Navigation", ""},
       {0, NULL, 0, NULL, NULL},
   };
@@ -4804,7 +4804,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
   RNA_def_property_ui_text(
       prop,
       "Mini Axes Type",
-      "Show a small rotating 3D axes in the top right corner of the 3D viewport");
+      "Show small rotating 3D axes in the top right corner of the 3D viewport");
   RNA_def_property_update(prop, 0, "rna_userdef_gizmo_update");
 
   prop = RNA_def_property(srna, "mini_axis_size", PROP_INT, PROP_PIXEL);

source/blender/nodes/NOD_static_types.h

@@ -337,7 +337,7 @@ DefNode(GeometryNode, GEO_NODE_INPUT_MESH_EDGE_ANGLE, 0, "MESH_EDGE_ANGLE", Inpu
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_EDGE_NEIGHBORS, 0, "MESH_EDGE_NEIGHBORS",InputMeshEdgeNeighbors, "Edge Neighbors", "Retrieve the number of faces that use each edge as one of their sides")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_EDGE_VERTICES, 0, "MESH_EDGE_VERTICES", InputMeshEdgeVertices, "Edge Vertices", "Retrieve topology information relating to each edge of a mesh")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_AREA, 0, "MESH_FACE_AREA", InputMeshFaceArea, "Face Area", "Calculate the surface area of a mesh's faces")
-DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_IS_PLANAR, 0, "MESH_FACE_IS_PLANAR",InputMeshFaceIsPlanar, "Is Face Planar", "Retrieve whether all triangles in a face are on the same plane, i.e. whether have the same normal")
+DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_IS_PLANAR, 0, "MESH_FACE_IS_PLANAR", InputMeshFaceIsPlanar, "Is Face Planar", "Retrieve whether all triangles in a face are on the same plane, i.e. whether they have the same normal")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_FACE_NEIGHBORS, 0, "MESH_FACE_NEIGHBORS",InputMeshFaceNeighbors, "Face Neighbors", "Retrieve topology information relating to each face of a mesh")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_ISLAND, 0, "MESH_ISLAND", InputMeshIsland, "Mesh Island", "Retrieve information about separate connected regions in a mesh")
 DefNode(GeometryNode, GEO_NODE_INPUT_MESH_VERTEX_NEIGHBORS, 0, "MESH_VERTEX_NEIGHBORS", InputMeshVertexNeighbors, "Vertex Neighbors", "Retrieve topology information relating to each vertex of a mesh")