[Bf-blender-cvs] [4fd7b1f3db3] master: Geometry Nodes: Rename "Grid" to "Density"

[Hans Goudey]

Commit: 4fd7b1f3db345b83f12c60f75a8dd17bd050d40d
Author: Hans Goudey
Date:   Wed Mar 31 10:10:44 2021 -0500
Branches: master
https://developer.blender.org/rB4fd7b1f3db345b83f12c60f75a8dd17bd050d40d

Geometry Nodes: Rename "Grid" to "Density"

For other "Attribute Name" fields we usually give a more specific name
that relates to what the attribute is actually used for, like "Mask" in
the point separate node. This is a similar situation, and would also
be consistent with the naming planned in D10506.

===================================================================

M	source/blender/blenloader/intern/versioning_290.c
M	source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 2449e35055e..c2f8b7b4ebe 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -1950,6 +1950,13 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
   {
     /* Keep this block, even when empty. */
 
+    FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+      if (ntree->type == NTREE_GEOMETRY) {
+        version_node_socket_name(ntree, GEO_NODE_VOLUME_TO_MESH, "Grid", "Density");
+      }
+    }
+    FOREACH_NODETREE_END;
+
     if (!DNA_struct_elem_find(fd->filesdna, "bArmature", "float", "axes_position")) {
       /* Convert the axes draw position to its old default (tip of bone). */
       LISTBASE_FOREACH (struct bArmature *, arm, &bmain->armatures) {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
index 54dccb613a1..1c0e7106b19 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
@@ -36,7 +36,7 @@
 
 static bNodeSocketTemplate geo_node_volume_to_mesh_in[] = {
     {SOCK_GEOMETRY, N_("Geometry")},
-    {SOCK_STRING, N_("Grid")},
+    {SOCK_STRING, N_("Density")},
     {SOCK_FLOAT, N_("Voxel Size"), 0.3f, 0.0f, 0.0f, 0.0f, 0.01f, FLT_MAX},
     {SOCK_FLOAT, N_("Voxel Amount"), 64.0f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX},
     {SOCK_FLOAT, N_("Threshold"), 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX},
@@ -64,7 +64,7 @@ static void geo_node_volume_to_mesh_init(bNodeTree *UNUSED(ntree), bNode *node)
       sizeof(NodeGeometryVolumeToMesh), __func__);
   data->resolution_mode = VOLUME_TO_MESH_RESOLUTION_MODE_GRID;
 
-  bNodeSocket *grid_socket = nodeFindSocket(node, SOCK_IN, "Grid");
+  bNodeSocket *grid_socket = nodeFindSocket(node, SOCK_IN, "Density");
   bNodeSocketValueString *grid_socket_value = (bNodeSocketValueString *)grid_socket->default_value;
   STRNCPY(grid_socket_value->value, "density");
 
@@ -120,7 +120,7 @@ static void create_mesh_from_volume(GeometrySet &geometry_set_in,
   Main *bmain = DEG_get_bmain(params.depsgraph());
   BKE_volume_load(const_cast<Volume *>(volume), bmain);
 
-  const std::string grid_name = params.get_input<std::string>("Grid");
+  const std::string grid_name = params.get_input<std::string>("Density");
   VolumeGrid *volume_grid = BKE_volume_grid_find(volume, grid_name.c_str());
   if (volume_grid == nullptr) {
     return;