blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Preferences: remove Geometry Nodes from experimental

This commit is contained in:
Dalai Felinto 2020-11-18 00:19:29 +01:00 committed by Jacques Lucke
parent b1d1a58c77
commit 56931f63c6
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -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"),
),
)

8
source/blender/editors/space_node/space_node.c
View File

@ -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);
}

3
source/blender/makesdna/DNA_userdef_types.h
View File

@ -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;

5
source/blender/makesrna/intern/rna_userdef.c
View File

@ -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(