griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #146497: Geometry Nodes: Don't display deprecated "Texture" socket type

Browse Source 
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
This commit is contained in:
Hans Goudey
2025-09-27 19:52:18 +02:00
committed by Hans Goudey
parent eef9a1b9ae
commit 3bed61b33c
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/nodes/geometry/node_geometry_tree.cc
View File

@@ -133,7 +133,6 @@ static bool geometry_node_tree_socket_type_valid(blender::bke::bNodeTreeType * /
SOCK_OBJECT, SOCK_OBJECT,
SOCK_GEOMETRY, SOCK_GEOMETRY,
SOCK_COLLECTION, SOCK_COLLECTION,
SOCK_TEXTURE,
SOCK_IMAGE, SOCK_IMAGE,
SOCK_MATERIAL, SOCK_MATERIAL,
SOCK_MENU) || SOCK_MENU) ||

7
tests/python/bl_node_group_interface.py
View File

@@ -71,8 +71,6 @@ class NodeGroupInterfaceTests:
return (0.3, 5.0, -42) return (0.3, 5.0, -42)
elif (socket_type == "NodeSocketString"): elif (socket_type == "NodeSocketString"):
return "Hello World!" return "Hello World!"
elif (socket_type == "NodeSocketTexture"):
return bpy.data.textures.new("test", 'MAGIC')
elif (socket_type == "NodeSocketVector"): elif (socket_type == "NodeSocketVector"):
return (4.0, -1.0, 0.0) return (4.0, -1.0, 0.0)
@@ -93,8 +91,7 @@ class NodeGroupInterfaceTests:
"NodeSocketMaterial", "NodeSocketMaterial",
"NodeSocketObject", "NodeSocketObject",
"NodeSocketRotation", "NodeSocketRotation",
"NodeSocketString", "NodeSocketString"}):
"NodeSocketTexture"}):
return cmp_default return cmp_default
elif (socket_type in {"NodeSocketColor", elif (socket_type in {"NodeSocketColor",
"NodeSocketVector"}): "NodeSocketVector"}):
@@ -360,7 +357,7 @@ class GeometryNodeGroupInterfaceTest(AbstractNodeGroupInterfaceTest, NodeGroupIn
self.do_test_socket_type("NodeSocketRotation") self.do_test_socket_type("NodeSocketRotation")
self.do_test_invalid_socket_type("NodeSocketShader") self.do_test_invalid_socket_type("NodeSocketShader")
self.do_test_socket_type("NodeSocketString") 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_socket_type("NodeSocketVector")
self.do_test_invalid_socket_type("NodeSocketVirtual") self.do_test_invalid_socket_type("NodeSocketVirtual")