[Bf-blender-cvs] [56931f63c6c] master: Preferences: remove Geometry Nodes from experimental

[Dalai Felinto]

Commit: 56931f63c6c42ee0435fb64b221099077c4ed06d
Author: Dalai Felinto
Date:   Wed Nov 18 00:19:29 2020 +0100
Branches: master
https://developer.blender.org/rB56931f63c6c42ee0435fb64b221099077c4ed06d

Preferences: remove Geometry Nodes from experimental

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

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/editors/space_node/space_node.c
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 8d73b0a0b93..7d92d6475eb 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2201,7 +2201,6 @@ class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
             context, (
                 ({"property": "use_new_hair_type"}, "T68981"),
                 ({"property": "use_new_point_cloud_type"}, "T75717"),
-                ({"property": "use_new_geometry_nodes"}, "project/profile/121"),
             ),
         )
 
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index baee08608ce..afc1a963f4f 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -938,13 +938,7 @@ static void node_space_subtype_item_extend(bContext *C, EnumPropertyItem **item,
 {
   bool free;
   const EnumPropertyItem *item_src = RNA_enum_node_tree_types_itemf_impl(C, &free);
-  for (const EnumPropertyItem *item_iter = item_src; item_iter->identifier; item_iter++) {
-    if (!U.experimental.use_new_geometry_nodes &&
-        STREQ(item_iter->identifier, "GeometryNodeTree")) {
-      continue;
-    }
-    RNA_enum_item_add(item, totitem, item_iter);
-  }
+  RNA_enum_items_add(item, totitem, item_src);
   if (free) {
     MEM_freeN((void *)item_src);
   }
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 464eed4779f..337f246216f 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -630,14 +630,13 @@ typedef struct UserDef_Experimental {
   char SANITIZE_AFTER_HERE;
   /* The following options are automatically sanitized (set to 0)
    * when the release cycle is not alpha. */
-  char use_new_geometry_nodes;
   char use_new_hair_type;
   char use_new_point_cloud_type;
   char use_sculpt_vertex_colors;
   char use_switch_object_operator;
   char use_sculpt_tools_tilt;
   char use_object_add_tool;
-  char _pad[6];
+  char _pad[7];
   /** `makesdna` does not allow empty structs. */
 } UserDef_Experimental;
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 08912e11146..0b7cc7a695a 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6154,11 +6154,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
       "Undo Legacy",
       "Use legacy undo (slower than the new default one, but may be more stable in some cases)");
 
-  prop = RNA_def_property(srna, "use_new_geometry_nodes", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, NULL, "use_new_geometry_nodes", 1);
-  RNA_def_property_ui_text(
-      prop, "New Geometry Nodes", "Enable the new geometry nodes system in the ui");
-
   prop = RNA_def_property(srna, "use_new_point_cloud_type", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "use_new_point_cloud_type", 1);
   RNA_def_property_ui_text(