Merge pull request #352 from mmatl/master

Fix small issues with DAE and GLB mats
mikedh · Mar 22, 2019 · f00158c · f00158c
2 parents b10de27 + b74fc86
commit f00158c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/trimesh/exchange/dae.py b/trimesh/exchange/dae.py
@@ -210,7 +210,7 @@ def _parse_node(node,
 
                 # Get UV coordinates if possible
                 vis = None
-                if colors is None and primitive.material in local_material_map:
+                if primitive.material in local_material_map:
                     material = copy.copy(
                         local_material_map[primitive.material])
                     uv = None

diff --git a/trimesh/exchange/gltf.py b/trimesh/exchange/gltf.py
@@ -783,17 +783,16 @@ def _read_buffers(header, buffers, mesh_kwargs):
             kwargs["vertices"] = access[p["attributes"]["POSITION"]]
 
             # do we have UV coordinates
-            if "TEXCOORD_0" in p["attributes"]:
-                if "material" not in p:
-                    log.warning("texcoord without material!")
-                else:
+            if "material" in p:
+                uv = None
+                if "TEXCOORD_0" in p["attributes"]:
                     # flip UV's top- bottom to move origin to lower-left:
                     # https://github.com/KhronosGroup/glTF/issues/1021
                     uv = access[p["attributes"]["TEXCOORD_0"]].copy()
                     uv[:, 1] = 1.0 - uv[:, 1]
                     # create a texture visual
-                    kwargs["visual"] = visual.texture.TextureVisuals(
-                        uv=uv, material=materials[p["material"]])
+                kwargs["visual"] = visual.texture.TextureVisuals(
+                    uv=uv, material=materials[p["material"]])
 
             # create a unique mesh name per- primitive
             if "name" in m: