From e84c60561c5feca4dd303a78be73724bfb42484d Mon Sep 17 00:00:00 2001 From: Jesse Yurkovich Date: Wed, 21 May 2025 20:42:11 +0200 Subject: [PATCH] Cleanup: Remove Dots Stroke material from USD's empty.blend test file This extra material in what should be an empty file often makes some checks and text comparisons needlessly more confusing. Pull Request: https://projects.blender.org/blender/blender/pulls/139228 --- .../usd/compare/reference/usd_anim_camera_props.txt | 13 ------------- tests/files/usd/empty.blend | 4 ++-- tests/python/bl_usd_import_test.py | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/tests/files/usd/compare/reference/usd_anim_camera_props.txt b/tests/files/usd/compare/reference/usd_anim_camera_props.txt index 380b1e7f686..649de6ce598 100644 --- a/tests/files/usd/compare/reference/usd_anim_camera_props.txt +++ b/tests/files/usd/compare/reference/usd_anim_camera_props.txt @@ -291,19 +291,6 @@ - fov 0.691 (h 0.691 v 0.400) - sensor 36.0x20.2 shift 0.000,0.000 -==== Materials: 1 -- Mat 'Dots Stroke' - - base color (0.800, 0.800, 0.800) - - specular ior 0.500 - - specular tint (0.000, 0.000, 0.000) - - roughness 0.400 - - metallic 0.000 - - ior 1.000 - - viewport diffuse (0.800, 0.800, 0.800, 1.000) - - viewport specular (1.000, 1.000, 1.000), intensity 0.500 - - viewport metallic 0.000, roughness 0.400 - - backface False probe True shadow False - ==== Actions: 4 - Action 'CamAAction' curverange:(1.0 .. 5.0) layers:1 - ActionLayer Layer strips:1 diff --git a/tests/files/usd/empty.blend b/tests/files/usd/empty.blend index a21538d6e9f..0072f6075dd 100644 --- a/tests/files/usd/empty.blend +++ b/tests/files/usd/empty.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8e696d4d16ebf9d8e5ef9afcf223ef3aecd5b2337512d316d628c4c4e586f88 -size 79690 +oid sha256:5b9e9845b7a9d7346e8ad5851661b6af0ed654324883ad77c8a7769664920a61 +size 90010 diff --git a/tests/python/bl_usd_import_test.py b/tests/python/bl_usd_import_test.py index 10660f77969..e77149801fd 100644 --- a/tests/python/bl_usd_import_test.py +++ b/tests/python/bl_usd_import_test.py @@ -1691,13 +1691,13 @@ class USDImportTest(AbstractUSDTest): self.assertEqual(image.tiles[tile].size[1], size) def check_materials(): - self.assertEqual(len(bpy.data.materials), 7) # +1 because of the "Dots Stroke" material self.assertTrue("Clip_With_LessThanInvert" in bpy.data.materials) self.assertTrue("Clip_With_Round" in bpy.data.materials) self.assertTrue("Material" in bpy.data.materials) self.assertTrue("NormalMap" in bpy.data.materials) self.assertTrue("NormalMap_Scale_Bias" in bpy.data.materials) self.assertTrue("Transforms" in bpy.data.materials) + self.assertEqual(len(bpy.data.materials), 6) # Reload the empty file and import back in using IMPORT_PACK bpy.ops.wm.open_mainfile(filepath=str(self.testdir / "empty.blend"))