From 3bed61b33c57b81e679256091f9eec94380b1b4b Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Sat, 27 Sep 2025 19:52:18 +0200 Subject: [PATCH] Fix #146497: Geometry Nodes: Don't display deprecated "Texture" socket type Ideally we'll remove this socket type at some point, but for now we should make sure not to display it. Pull Request: https://projects.blender.org/blender/blender/pulls/146502 --- source/blender/nodes/geometry/node_geometry_tree.cc | 1 - tests/python/bl_node_group_interface.py | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc index efaf3aeec15..0f80f7af775 100644 --- a/source/blender/nodes/geometry/node_geometry_tree.cc +++ b/source/blender/nodes/geometry/node_geometry_tree.cc @@ -133,7 +133,6 @@ static bool geometry_node_tree_socket_type_valid(blender::bke::bNodeTreeType * / SOCK_OBJECT, SOCK_GEOMETRY, SOCK_COLLECTION, - SOCK_TEXTURE, SOCK_IMAGE, SOCK_MATERIAL, SOCK_MENU) || diff --git a/tests/python/bl_node_group_interface.py b/tests/python/bl_node_group_interface.py index 4e59c552a10..4fde02a6878 100644 --- a/tests/python/bl_node_group_interface.py +++ b/tests/python/bl_node_group_interface.py @@ -71,8 +71,6 @@ class NodeGroupInterfaceTests: return (0.3, 5.0, -42) elif (socket_type == "NodeSocketString"): return "Hello World!" - elif (socket_type == "NodeSocketTexture"): - return bpy.data.textures.new("test", 'MAGIC') elif (socket_type == "NodeSocketVector"): return (4.0, -1.0, 0.0) @@ -93,8 +91,7 @@ class NodeGroupInterfaceTests: "NodeSocketMaterial", "NodeSocketObject", "NodeSocketRotation", - "NodeSocketString", - "NodeSocketTexture"}): + "NodeSocketString"}): return cmp_default elif (socket_type in {"NodeSocketColor", "NodeSocketVector"}): @@ -360,7 +357,7 @@ class GeometryNodeGroupInterfaceTest(AbstractNodeGroupInterfaceTest, NodeGroupIn self.do_test_socket_type("NodeSocketRotation") self.do_test_invalid_socket_type("NodeSocketShader") self.do_test_socket_type("NodeSocketString") - self.do_test_socket_type("NodeSocketTexture") + self.do_test_invalid_socket_type("NodeSocketTexture") self.do_test_socket_type("NodeSocketVector") self.do_test_invalid_socket_type("NodeSocketVirtual")