Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Matthews <johnny.matthews@gmail.com>2021-10-14 20:22:33 +0300
committerJohnny Matthews <johnny.matthews@gmail.com>2021-10-14 20:22:33 +0300
commitcddda706188a9ebb14ddbfbed5651f321ef31522 (patch)
treefe22aafff347f985cd26e1080105bc85350febc3 /release
parent42a05ff6ea2a39d1be47143cf5bcb58c53af7a05 (diff)
Geometry Nodes: Merge Conflict Cleanup
Removing a line that remained from a merge.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/nodeitems_builtins.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index b26454e0313..932a6ba853d 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -143,7 +143,6 @@ def mesh_node_items(context):
yield NodeItem("GeometryNodeLegacySubdivisionSurface", poll=geometry_nodes_legacy_poll)
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
- yield NodeItem("GeometryNodeEdgeSplit")
yield NodeItem("GeometryNodeMeshBoolean")
yield NodeItem("GeometryNodeMeshToCurve")
yield NodeItem("GeometryNodeMeshToPoints")