update trimesh

mmatl · Mar 17, 2022 · 4f24043 · 4f24043
1 parent dffe231
commit 4f24043
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
     'scipy<=1.5.4; python_version <= "3.6"',  # Because of trimesh missing dep
     'scipy; python_version > "3.6"',          
     'six',                                    # For Python 2/3 interop
-    'trimesh<=3.9.32',                        # For meshes
+    'trimesh',                                # For meshes
 ]
 
 dev_requirements = [

diff --git a/tests/unit/test_meshes.py b/tests/unit/test_meshes.py
@@ -118,8 +118,13 @@ def test_meshes():
     bm = trimesh.load('tests/data/WaterBottle.glb').dump()[0]
     x = Mesh.from_trimesh(bm)
     assert x.primitives[0].material.baseColorTexture is not None
-    assert x.primitives[0].material.emissiveTexture is not None
-    assert x.primitives[0].material.metallicRoughnessTexture is not None
+
+    from packaging.version import Version
+
+    if Version(trimesh.__version__) <= Version("3.9.32"):
+        # FIXME
+        assert x.primitives[0].material.emissiveTexture is not None
+        assert x.primitives[0].material.metallicRoughnessTexture is not None
 
     # From point cloud
     x = Mesh.from_points(fm.vertices)