Merge branch 'blender-v3.6-release' #104736

Merged
Sebastian Sille merged 3 commits from blender-v3.6-release into main 2023-07-05 09:14:20 +02:00
2 changed files with 33 additions and 1 deletions
Showing only changes of commit afa9b939b6 - Show all commits

View File

@ -101,7 +101,7 @@ def files_to_clean_file_names_for_sockets(files, sockets):
socket_tags = socket[1] socket_tags = socket[1]
all_tags.update(socket_tags) all_tags.update(socket_tags)
while True: while len(names_to_tag_lists) > 1:
something_changed = False something_changed = False
# Common prefixes / suffixes provide zero information about what file # Common prefixes / suffixes provide zero information about what file

View File

@ -253,6 +253,38 @@ class TestPutFileNamesInSockets(unittest.TestCase):
}, },
) )
def test_single_file_good(self):
"""Regression test for https://projects.blender.org/blender/blender-addons/issues/104573"""
files = [
MockFile("banana-color.webp"),
]
sockets = sockets_fixture()
match_files_to_socket_names(files, sockets)
assert_sockets(
self,
sockets,
{
"Base Color": "banana-color.webp",
},
)
def test_single_file_bad(self):
"""Regression test for https://projects.blender.org/blender/blender-addons/issues/104573"""
files = [
MockFile("README-banana.txt"),
]
sockets = sockets_fixture()
match_files_to_socket_names(files, sockets)
assert_sockets(
self,
sockets,
{},
)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main(verbosity=2) unittest.main(verbosity=2)