From f106369ce8577aa9115fead1eff3acd34273a86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 8 May 2020 13:42:39 +0200 Subject: Alembic: prevent spaces in names of exported particle systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Other types already had spaces, periods, and colons replaced by underscores. The upcoming Alembic exporter (based on the `AbstractHierarcyIterator` class) will be more consistent and apply the same naming rules everywhere. This is in preparation for that change. The `get_…_name()` functions in `abc_util.{cc,h}` will be removed then. --- tests/python/alembic_tests.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/python') diff --git a/tests/python/alembic_tests.py b/tests/python/alembic_tests.py index fbb9496c9df..ec290001a6f 100644 --- a/tests/python/alembic_tests.py +++ b/tests/python/alembic_tests.py @@ -280,10 +280,10 @@ class HairParticlesExportTest(AbstractAlembicTest): def test_with_both(self, tempdir: pathlib.Path): abc = self._do_test(tempdir, True, True) - abcprop = self.abcprop(abc, '/Suzanne/Hair system/.geom') + abcprop = self.abcprop(abc, '/Suzanne/Hair_system/.geom') self.assertIn('nVertices', abcprop) - abcprop = self.abcprop(abc, '/Suzanne/Non-hair particle system/.geom') + abcprop = self.abcprop(abc, '/Suzanne/Non-hair_particle_system/.geom') self.assertIn('.velocities', abcprop) abcprop = self.abcprop(abc, '/Suzanne/MonkeyMesh/.geom') @@ -293,11 +293,11 @@ class HairParticlesExportTest(AbstractAlembicTest): def test_with_hair_only(self, tempdir: pathlib.Path): abc = self._do_test(tempdir, True, False) - abcprop = self.abcprop(abc, '/Suzanne/Hair system/.geom') + abcprop = self.abcprop(abc, '/Suzanne/Hair_system/.geom') self.assertIn('nVertices', abcprop) self.assertRaises(AbcPropError, self.abcprop, abc, - '/Suzanne/Non-hair particle system/.geom') + '/Suzanne/Non-hair_particle_system/.geom') abcprop = self.abcprop(abc, '/Suzanne/MonkeyMesh/.geom') self.assertIn('.faceIndices', abcprop) @@ -306,9 +306,9 @@ class HairParticlesExportTest(AbstractAlembicTest): def test_with_particles_only(self, tempdir: pathlib.Path): abc = self._do_test(tempdir, False, True) - self.assertRaises(AbcPropError, self.abcprop, abc, '/Suzanne/Hair system/.geom') + self.assertRaises(AbcPropError, self.abcprop, abc, '/Suzanne/Hair_system/.geom') - abcprop = self.abcprop(abc, '/Suzanne/Non-hair particle system/.geom') + abcprop = self.abcprop(abc, '/Suzanne/Non-hair_particle_system/.geom') self.assertIn('.velocities', abcprop) abcprop = self.abcprop(abc, '/Suzanne/MonkeyMesh/.geom') @@ -318,9 +318,9 @@ class HairParticlesExportTest(AbstractAlembicTest): def test_with_neither(self, tempdir: pathlib.Path): abc = self._do_test(tempdir, False, False) - self.assertRaises(AbcPropError, self.abcprop, abc, '/Suzanne/Hair system/.geom') + self.assertRaises(AbcPropError, self.abcprop, abc, '/Suzanne/Hair_system/.geom') self.assertRaises(AbcPropError, self.abcprop, abc, - '/Suzanne/Non-hair particle system/.geom') + '/Suzanne/Non-hair_particle_system/.geom') abcprop = self.abcprop(abc, '/Suzanne/MonkeyMesh/.geom') self.assertIn('.faceIndices', abcprop) -- cgit v1.2.3