Merge branch 'master' into soc-2021-uv-edge-select-support

1 files changed, 22 insertions, 7 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
index 6515afe5966..1a92be1c05d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
@@ -29,12 +29,25 @@ namespace blender::nodes {
 
 static void geo_node_mesh_primitive_line_declare(NodeDeclarationBuilder &b)
 {
-  b.add_input<decl::Int>(N_("Count")).default_value(10).min(1).max(10000);
-  b.add_input<decl::Float>(N_("Resolution")).default_value(1.0f).min(0.1f).subtype(PROP_DISTANCE);
-  b.add_input<decl::Vector>(N_("Start Location")).subtype(PROP_TRANSLATION);
+  b.add_input<decl::Int>(N_("Count"))
+      .default_value(10)
+      .min(1)
+      .max(10000)
+      .description(N_("Number of vertices on the line"));
+  b.add_input<decl::Float>(N_("Resolution"))
+      .default_value(1.0f)
+      .min(0.1f)
+      .subtype(PROP_DISTANCE)
+      .description(N_("Length of each individual edge"));
+  b.add_input<decl::Vector>(N_("Start Location"))
+      .subtype(PROP_TRANSLATION)
+      .description(N_("Position of the first vertex"));
   b.add_input<decl::Vector>(N_("Offset"))
       .default_value({0.0f, 0.0f, 1.0f})
-      .subtype(PROP_TRANSLATION);
+      .subtype(PROP_TRANSLATION)
+      .description(N_(
+          "In offset mode, the distance between each socket on each axis. In end points mode, the "
+          "position of the final vertex"));
   b.add_output<decl::Geometry>(N_("Mesh"));
 }
 
@@ -61,7 +74,7 @@ static void geo_node_mesh_primitive_line_init(bNodeTree *UNUSED(ntree), bNode *n
   node->storage = node_storage;
 }
 
-static void geo_node_mesh_primitive_line_update(bNodeTree *UNUSED(tree), bNode *node)
+static void geo_node_mesh_primitive_line_update(bNodeTree *ntree, bNode *node)
 {
   bNodeSocket *count_socket = (bNodeSocket *)node->inputs.first;
   bNodeSocket *resolution_socket = count_socket->next;
@@ -77,10 +90,12 @@ static void geo_node_mesh_primitive_line_update(bNodeTree *UNUSED(tree), bNode *
                   (mode == GEO_NODE_MESH_LINE_MODE_END_POINTS) ? N_("End Location") :
                                                                  N_("Offset"));
 
-  nodeSetSocketAvailability(resolution_socket,
+  nodeSetSocketAvailability(ntree,
+                            resolution_socket,
                             mode == GEO_NODE_MESH_LINE_MODE_END_POINTS &&
                                 count_mode == GEO_NODE_MESH_LINE_COUNT_RESOLUTION);
-  nodeSetSocketAvailability(count_socket,
+  nodeSetSocketAvailability(ntree,
+                            count_socket,
                             mode == GEO_NODE_MESH_LINE_MODE_OFFSET ||
                                 count_mode == GEO_NODE_MESH_LINE_COUNT_TOTAL);
 }