Pose Library: Update to use the asset shelf (when enabled) #104546

Merged
Julian Eisel merged 33 commits from asset-shelf into main 2023-08-04 15:00:21 +02:00
3 changed files with 38 additions and 2 deletions
Showing only changes of commit 692ffaa38a - Show all commits

5
node_wrangler/README.md Normal file
View File

@ -0,0 +1,5 @@
# Running Tests
```
./util_test.py
```

View File

@ -153,10 +153,13 @@ def match_files_to_socket_names(files, sockets):
for sname in sockets: for sname in sockets:
for name, tag_list in names_to_tag_lists.items(): for name, tag_list in names_to_tag_lists.items():
if sname[0] == "Normal" and "dx" in tag_list: if sname[0] == "Normal":
# Blender wants GL normals, not DX (DirectX) ones: # Blender wants GL normals, not DX (DirectX) ones:
# https://www.reddit.com/r/blender/comments/rbuaua/texture_contains_normaldx_and_normalgl_files/ # https://www.reddit.com/r/blender/comments/rbuaua/texture_contains_normaldx_and_normalgl_files/
continue if 'dx' in tag_list:
continue
if 'directx' in tag_list:
continue
matches = set(sname[1]).intersection(set(tag_list)) matches = set(sname[1]).intersection(set(tag_list))
if matches: if matches:

View File

@ -225,6 +225,34 @@ class TestPutFileNamesInSockets(unittest.TestCase):
}, },
) )
def test_texturecan(self):
"""Texture from: https://www.texturecan.com/details/67/"""
files = [
MockFile("metal_0010_ao_1k.jpg"),
MockFile("metal_0010_color_1k.jpg"),
MockFile("metal_0010_height_1k.png"),
MockFile("metal_0010_metallic_1k.jpg"),
MockFile("metal_0010_normal_directx_1k.png"),
MockFile("metal_0010_normal_opengl_1k.png"),
MockFile("metal_0010_roughness_1k.jpg"),
]
sockets = sockets_fixture()
match_files_to_socket_names(files, sockets)
assert_sockets(
self,
sockets,
{
"Ambient Occlusion": "metal_0010_ao_1k.jpg",
"Base Color": "metal_0010_color_1k.jpg",
"Displacement": "metal_0010_height_1k.png",
"Metallic": "metal_0010_metallic_1k.jpg",
"Normal": "metal_0010_normal_opengl_1k.png",
"Roughness": "metal_0010_roughness_1k.jpg",
},
)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main(verbosity=2) unittest.main(verbosity=2)