[Bf-blender-cvs] [9708b1f317a] master: Cleanup: Rename enum values

[Hans Goudey]

Commit: 9708b1f317a16f329bbd249c73003330c935d4f7
Author: Hans Goudey
Date:   Thu Oct 7 14:00:11 2021 -0500
Branches: master
https://developer.blender.org/rB9708b1f317a16f329bbd249c73003330c935d4f7

Cleanup: Rename enum values

This makes the diff for adding a new version of the attribute transfer
node slightly smaller.

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

M	source/blender/makesdna/DNA_node_types.h
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc

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

diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index ea87cef1118..edbb0070462 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -2136,8 +2136,8 @@ typedef enum GeometryNodeCurveFilletMode {
 } GeometryNodeCurveFilletMode;
 
 typedef enum GeometryNodeAttributeTransferMapMode {
-  GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED = 0,
-  GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST = 1,
+  GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED = 0,
+  GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER_NEAREST = 1,
 } GeometryNodeAttributeTransferMapMode;
 
 typedef enum GeometryNodeRaycastMapMode {
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index ddd2a3fcee0..5e997f81753 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -10522,13 +10522,13 @@ static void def_geo_curve_trim(StructRNA *srna)
 static void def_geo_attribute_transfer(StructRNA *srna)
 {
   static EnumPropertyItem mapping_items[] = {
-      {GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED,
+      {GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED,
        "NEAREST_FACE_INTERPOLATED",
        0,
        "Nearest Face Interpolated",
        "Transfer the attribute from the nearest face on a surface (loose points and edges are "
        "ignored)"},
-      {GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST,
+      {GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER_NEAREST,
        "NEAREST",
        0,
        "Nearest",
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
index f187ee39b94..0006905a445 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
@@ -463,12 +463,12 @@ static void transfer_attribute(const GeoNodeExecParams &params,
       "position", dst_domain, {0, 0, 0});
 
   switch (mapping) {
-    case GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED: {
+    case GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED: {
       transfer_attribute_nearest_face_interpolated(
           src_geometry, dst_component, dst_positions, dst_domain, data_type, src_name, dst_name);
       break;
     }
-    case GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST: {
+    case GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER_NEAREST: {
       transfer_attribute_nearest(
           src_geometry, dst_component, dst_positions, dst_domain, data_type, src_name, dst_name);
       break;