Geometry Nodes: Remove experimental option for fields

This enables fields as the official workflow for geometry nodes.
While many features are converted to use fields rather than the old
attribute workflow, many are not yet converted. In that case, the
unconverted nodes are still accessible with an experimental option.
In the coming weeks the rest of the nodes will be converted.

Differential Revision: https://developer.blender.org/D12672

2 files changed, 11 insertions, 16 deletions

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index f2f9b82480d..d294491d51c 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -1146,8 +1146,7 @@ static void draw_property_for_socket(uiLayout *layout,
       break;
     }
     default: {
-      if (input_has_attribute_toggle(*nmd->node_group, socket_index) &&
-          USER_EXPERIMENTAL_TEST(&U, use_geometry_nodes_fields)) {
+      if (input_has_attribute_toggle(*nmd->node_group, socket_index)) {
         const std::string rna_path_use_attribute = "[\"" + std::string(socket_id_esc) +
                                                    use_attribute_suffix + "\"]";
         const std::string rna_path_attribute_name = "[\"" + std::string(socket_id_esc) +
@@ -1240,7 +1239,7 @@ static void panel_draw(const bContext *C, Panel *panel)
     });
   }
 
-  if (USER_EXPERIMENTAL_TEST(&U, use_geometry_nodes_fields) && has_legacy_node) {
+  if (has_legacy_node) {
     uiLayout *row = uiLayoutRow(layout, false);
     uiItemL(row, IFACE_("Node tree has legacy node"), ICON_ERROR);
     uiLayout *sub = uiLayoutRow(row, false);
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
index d9ea5696bf5..b9a9437d761 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
@@ -878,11 +878,9 @@ class GeometryNodesEvaluator {
 
     NodeParamsProvider params_provider{*this, node, node_state};
     GeoNodeExecParams params{params_provider};
-    if (USER_EXPERIMENTAL_TEST(&U, use_geometry_nodes_fields)) {
-      if (node->idname().find("Legacy") != StringRef::not_found) {
-        params.error_message_add(geo_log::NodeWarningType::Legacy,
-                                 TIP_("Legacy node will be removed before Blender 4.0"));
-      }
+    if (node->idname().find("Legacy") != StringRef::not_found) {
+      params.error_message_add(geo_log::NodeWarningType::Legacy,
+                               TIP_("Legacy node will be removed before Blender 4.0"));
     }
     bnode.typeinfo->geometry_node_execute(params);
   }
@@ -891,14 +889,12 @@ class GeometryNodesEvaluator {
                                    const MultiFunction &fn,
                                    NodeState &node_state)
   {
-    if (USER_EXPERIMENTAL_TEST(&U, use_geometry_nodes_fields)) {
-      if (node->idname().find("Legacy") != StringRef::not_found) {
-        /* Create geometry nodes params just for creating an error message. */
-        NodeParamsProvider params_provider{*this, node, node_state};
-        GeoNodeExecParams params{params_provider};
-        params.error_message_add(geo_log::NodeWarningType::Legacy,
-                                 TIP_("Legacy node will be removed before Blender 4.0"));
-      }
+    if (node->idname().find("Legacy") != StringRef::not_found) {
+      /* Create geometry nodes params just for creating an error message. */
+      NodeParamsProvider params_provider{*this, node, node_state};
+      GeoNodeExecParams params{params_provider};
+      params.error_message_add(geo_log::NodeWarningType::Legacy,
+                               TIP_("Legacy node will be removed before Blender 4.0"));
     }
 
     LinearAllocator<> &allocator = local_allocators_.local();