diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index b8cf3d54983..1c0f31bf747 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -696,7 +696,6 @@ void USDMeshReader::read_custom_data(const ImportSettings *settings, if (ELEM(type, pxr::SdfValueTypeNames->StringArray, - pxr::SdfValueTypeNames->QuatfArray, pxr::SdfValueTypeNames->QuatdArray, pxr::SdfValueTypeNames->QuathArray)) { diff --git a/tests/python/bl_usd_import_test.py b/tests/python/bl_usd_import_test.py index ffbe0815487..d573d24830f 100644 --- a/tests/python/bl_usd_import_test.py +++ b/tests/python/bl_usd_import_test.py @@ -1173,7 +1173,7 @@ class USDImportTest(AbstractUSDTest): # Verify all attributes on the Mesh # Note: USD does not support signed 8-bit types so there is # currently no equivalent to Blender's INT8 data type - # TODO: Blender is missing support for reading USD quat/matrix data types + # TODO: Blender is missing support for reading USD matrix data types mesh = bpy.data.objects["Mesh"].data self.check_attribute(mesh, "p_bool", 'POINT', 'BOOLEAN', 4) @@ -1184,7 +1184,7 @@ class USDImportTest(AbstractUSDTest): self.check_attribute(mesh, "p_color", 'POINT', 'FLOAT_COLOR', 4) self.check_attribute(mesh, "p_vec2", 'CORNER', 'FLOAT2', 4) # TODO: Bug - wrong domain self.check_attribute(mesh, "p_vec3", 'POINT', 'FLOAT_VECTOR', 4) - self.check_attribute_missing(mesh, "p_quat") + self.check_attribute(mesh, "p_quat", 'POINT', 'QUATERNION', 4) self.check_attribute_missing(mesh, "p_mat4x4") self.check_attribute(mesh, "f_bool", 'FACE', 'BOOLEAN', 1) @@ -1195,7 +1195,7 @@ class USDImportTest(AbstractUSDTest): self.check_attribute(mesh, "f_color", 'FACE', 'FLOAT_COLOR', 1) self.check_attribute(mesh, "f_vec2", 'FACE', 'FLOAT2', 1) self.check_attribute(mesh, "f_vec3", 'FACE', 'FLOAT_VECTOR', 1) - self.check_attribute_missing(mesh, "f_quat") + self.check_attribute(mesh, "f_quat", 'FACE', 'QUATERNION', 1) self.check_attribute_missing(mesh, "f_mat4x4") self.check_attribute(mesh, "fc_bool", 'CORNER', 'BOOLEAN', 4) @@ -1207,7 +1207,7 @@ class USDImportTest(AbstractUSDTest): self.check_attribute(mesh, "displayColor", 'CORNER', 'FLOAT_COLOR', 4) self.check_attribute(mesh, "fc_vec2", 'CORNER', 'FLOAT2', 4) self.check_attribute(mesh, "fc_vec3", 'CORNER', 'FLOAT_VECTOR', 4) - self.check_attribute_missing(mesh, "fc_quat") + self.check_attribute(mesh, "fc_quat", 'CORNER', 'QUATERNION', 4) self.check_attribute_missing(mesh, "fc_mat4x4") # Find the non "bezier" Curves object -- Has 2 curves (12 vertices each)