1 files changed, 64 insertions, 0 deletions
diff --git a/tests/python/alembic_export_tests.py b/tests/python/alembic_export_tests.py
index b5d6bf65f3f..1d34eb3fc81 100644
--- a/tests/python/alembic_export_tests.py
+++ b/tests/python/alembic_export_tests.py
@@ -111,6 +111,7 @@ class AbstractAlembicTest(AbstractBlenderRunnerTest):
             'uint64_t': int,
             'float64_t': float,
             'float32_t': float,
+            'string': str,
         }
 
         result = {}
@@ -586,6 +587,69 @@ class InvisibleObjectExportTest(AbstractAlembicTest):
         test('InvisibleAnimatedCube', False)
 
 
+class CustomPropertiesExportTest(AbstractAlembicTest):
+    """Test export of custom properties."""
+
+    def _run_export(self, tempdir: pathlib.Path) -> pathlib.Path:
+        abc = tempdir / 'custom-properties.abc'
+        script = "import bpy; bpy.context.scene.frame_set(1); bpy.ops.wm.alembic_export(filepath='%s', start=1, end=1)" % abc.as_posix()
+        self.run_blender('custom-properties.blend', script)
+        return abc
+
+    @with_tempdir
+    def test_xform_props(self, tempdir: pathlib.Path) -> None:
+        abc = self._run_export(tempdir)
+        abcprop = self.abcprop(abc, '/Cube/.xform/.userProperties')
+
+        # Simple, single values.
+        self.assertEqual(abcprop['static_int'], [327])
+        self.assertEqual(abcprop['static_float'], [47.01])
+        self.assertEqual(abcprop['static_string'], ['Agents'])
+        self.assertEqual(abcprop['keyed_float'], [-1])
+        self.assertEqual(abcprop['keyed_int'], [-47])
+
+        # Arrays.
+        self.assertEqual(abcprop['keyed_array_float'], [-1.000, 0.000, 1.000])
+        self.assertEqual(abcprop['keyed_array_int'], [42, 47, 327])
+
+        # Multi-dimensional arrays.
+        self.assertEqual(abcprop['array_of_strings'], ['ผัดไทย', 'Pad Thai'])
+        self.assertEqual(
+            abcprop['matrix_tuple'],
+            [1.0, 0.0, 0.0, 3.33333, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0])
+        self.assertEqual(
+            abcprop['static_matrix'],
+            [1.0, 0.0, 0.0, 3.33333, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0])
+        self.assertEqual(
+            abcprop['nonuniform_array'],
+            [10, 20, 30, 1, 2, 47])
+
+    @with_tempdir
+    def test_mesh_props(self, tempdir: pathlib.Path) -> None:
+        abc = self._run_export(tempdir)
+        abcprop = self.abcprop(abc, '/Cube/Cube/.geom/.userProperties')
+        self.assertEqual(abcprop['mesh_tags'], ['cube', 'box', 'low-poly-sphere'])
+
+    @with_tempdir
+    def test_camera_props(self, tempdir: pathlib.Path) -> None:
+        abc = self._run_export(tempdir)
+        abcprop = self.abcprop(abc, '/Camera/Hasselblad/.geom/.userProperties')
+        self.assertEqual(abcprop['type'], ['500c/m'])
+
+    @with_tempdir
+    def test_disabled_export_option(self, tempdir: pathlib.Path) -> None:
+        abc = tempdir / 'custom-properties.abc'
+        script = (
+            "import bpy; bpy.context.scene.frame_set(1); "
+            "bpy.ops.wm.alembic_export(filepath='%s', start=1, end=1, export_custom_properties=False)" % abc.as_posix()
+        )
+        self.run_blender('custom-properties.blend', script)
+
+        abcprop = self.abcprop(abc, '/Camera/Hasselblad/.geom/.userProperties')
+        self.assertIn('eyeSeparation', abcprop, 'Regular non-standard properties should still be written')
+        self.assertNotIn('type', abcprop, 'Custom properties should not be written')
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--blender', required=True)