From 213d00607ea00dade57ebed0cd0e33cdbf8b0b7c Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 16 Mar 2022 10:56:53 -0500 Subject: Cleanup: Further removal for legacy geometry nodes 943b919fe807b535586 missed removing the experimental option and the nodes from the add menu. --- release/scripts/startup/bl_ui/space_userpref.py | 1 - release/scripts/startup/nodeitems_builtins.py | 72 ------------------------- source/blender/makesdna/DNA_userdef_types.h | 3 +- source/blender/makesrna/intern/rna_userdef.c | 5 -- 4 files changed, 1 insertion(+), 80 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 09716c77917..d163eafb70d 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -2295,7 +2295,6 @@ class USERPREF_PT_experimental_debugging(ExperimentalPanel, Panel): ({"property": "use_undo_legacy"}, "T60695"), ({"property": "override_auto_resync"}, "T83811"), ({"property": "use_cycles_debug"}, None), - ({"property": "use_geometry_nodes_legacy"}, "T91274"), ({"property": "show_asset_debug_info"}, None), ({"property": "use_asset_indexing"}, None), ), diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 705b98c4d11..e7c00f4915e 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -71,18 +71,6 @@ def curve_node_items(context): space = context.space_data if not space: return - - if geometry_nodes_legacy_poll(context): - yield NodeItem("GeometryNodeLegacyCurveEndpoints") - yield NodeItem("GeometryNodeLegacyCurveReverse") - yield NodeItem("GeometryNodeLegacyCurveSubdivide") - yield NodeItem("GeometryNodeLegacyCurveToPoints") - yield NodeItem("GeometryNodeLegacyMeshToCurve") - yield NodeItem("GeometryNodeLegacyCurveSelectHandles") - yield NodeItem("GeometryNodeLegacyCurveSetHandles") - yield NodeItem("GeometryNodeLegacyCurveSplineType") - yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) - yield NodeItem("GeometryNodeCurveLength") yield NodeItem("GeometryNodeCurveToMesh") yield NodeItem("GeometryNodeCurveToPoints") @@ -119,12 +107,6 @@ def mesh_node_items(context): space = context.space_data if not space: return - - if geometry_nodes_legacy_poll(context): - yield NodeItem("GeometryNodeLegacyEdgeSplit", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacySubdivisionSurface", poll=geometry_nodes_legacy_poll) - yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) - yield NodeItem("GeometryNodeDualMesh") yield NodeItem("GeometryNodeExtrudeMesh") yield NodeItem("GeometryNodeFlipFaces") @@ -156,12 +138,6 @@ def geometry_node_items(context): space = context.space_data if not space: return - - if geometry_nodes_legacy_poll(context): - yield NodeItem("GeometryNodeLegacyDeleteGeometry", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacyRaycast", poll=geometry_nodes_legacy_poll) - yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) - yield NodeItem("GeometryNodeBoundBox") yield NodeItem("GeometryNodeConvexHull") yield NodeItem("GeometryNodeDeleteGeometry") @@ -185,11 +161,6 @@ def geometry_input_node_items(context): space = context.space_data if not space: return - - if geometry_nodes_legacy_poll(context): - yield NodeItem("FunctionNodeLegacyRandomFloat") - yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) - yield NodeItem("FunctionNodeInputBool") yield NodeItem("GeometryNodeCollectionInfo") yield NodeItem("FunctionNodeInputColor") @@ -217,12 +188,6 @@ def geometry_material_node_items(context): space = context.space_data if not space: return - - if geometry_nodes_legacy_poll(context): - yield NodeItem("GeometryNodeLegacyMaterialAssign") - yield NodeItem("GeometryNodeLegacySelectByMaterial") - yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) - yield NodeItem("GeometryNodeReplaceMaterial") yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) yield NodeItem("GeometryNodeInputMaterialIndex") @@ -238,17 +203,6 @@ def point_node_items(context): space = context.space_data if not space: return - - if geometry_nodes_legacy_poll(context): - yield NodeItem("GeometryNodeLegacyAlignRotationToVector", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacyPointDistribute", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacyPointInstance", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacyPointScale", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacyPointSeparate", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacyPointTranslate", poll=geometry_nodes_legacy_poll) - yield NodeItem("GeometryNodeLegacyRotatePoints", poll=geometry_nodes_legacy_poll) - yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) - yield NodeItem("GeometryNodeDistributePointsOnFaces") yield NodeItem("GeometryNodePointsToVertices") yield NodeItem("GeometryNodePointsToVolume") @@ -356,10 +310,6 @@ def object_eevee_cycles_shader_nodes_poll(context): eevee_cycles_shader_nodes_poll(context)) -def geometry_nodes_legacy_poll(context): - return context.preferences.experimental.use_geometry_nodes_legacy - - def named_attribute_poll(context): return context.preferences.experimental.use_named_attribute_nodes @@ -666,25 +616,6 @@ texture_node_categories = [ geometry_node_categories = [ # Geometry Nodes GeometryNodeCategory("GEO_ATTRIBUTE", "Attribute", items=[ - NodeItem("GeometryNodeLegacyAttributeRandomize", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeMath", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeClamp", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeCompare", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeConvert", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeCurveMap", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeFill", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeMix", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeProximity", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeColorRamp", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeVectorMath", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeVectorRotate", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeSampleTexture", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeCombineXYZ", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeSeparateXYZ", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeMapRange", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyAttributeTransfer", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeAttributeRemove", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeCaptureAttribute"), NodeItem("GeometryNodeAttributeDomainSize"), NodeItem("GeometryNodeAttributeStatistic"), @@ -780,9 +711,6 @@ geometry_node_categories = [ NodeItem("ShaderNodeVectorRotate"), ]), GeometryNodeCategory("GEO_VOLUME", "Volume", items=[ - NodeItem("GeometryNodeLegacyPointsToVolume", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeLegacyVolumeToMesh", poll=geometry_nodes_legacy_poll), - NodeItem("GeometryNodeVolumeToMesh"), ]), GeometryNodeCategory("GEO_GROUP", "Group", items=node_group_items), diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 5784d437048..d7c65d057bd 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -637,7 +637,6 @@ typedef struct UserDef_Experimental { char use_undo_legacy; char no_override_auto_resync; char use_cycles_debug; - char use_geometry_nodes_legacy; char show_asset_debug_info; char no_asset_indexing; char SANITIZE_AFTER_HERE; @@ -651,7 +650,7 @@ typedef struct UserDef_Experimental { char use_extended_asset_browser; char use_override_templates; char use_named_attribute_nodes; - char _pad[1]; + char _pad[2]; /** `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 78e6bfec03f..3ab6612d6a2 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -6437,11 +6437,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Override Templates", "Enable library override template in the python API"); - prop = RNA_def_property(srna, "use_geometry_nodes_legacy", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "use_geometry_nodes_legacy", 1); - RNA_def_property_ui_text( - prop, "Geometry Nodes Legacy", "Enable legacy geometry nodes in the menu"); - prop = RNA_def_property(srna, "use_named_attribute_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_named_attribute_nodes", 1); RNA_def_property_ui_text(prop, -- cgit v1.2.3