1 files changed, 35 insertions, 12 deletions

diff --git a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
index 6aec848573f..dcba78ac99e 100644
--- a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
@@ -60,7 +60,7 @@ TEST_F(obj_exporter_test, filter_objects_curves_as_mesh)
     return;
   }
   auto [objmeshes, objcurves]{filter_supported_objects(depsgraph, _export.params)};
-  EXPECT_EQ(objmeshes.size(), 20);
+  EXPECT_EQ(objmeshes.size(), 21);
   EXPECT_EQ(objcurves.size(), 0);
 }
 
@@ -185,17 +185,17 @@ TEST(obj_exporter_writer, mtllib)
 TEST(obj_exporter_writer, format_handler_buffer_chunking)
 {
   /* Use a tiny buffer chunk size, so that the test below ends up creating several blocks. */
-  FormatHandler<eFileType::OBJ, 16> h;
-  h.write<eOBJSyntaxElement::object_name>("abc");
-  h.write<eOBJSyntaxElement::object_name>("abcd");
-  h.write<eOBJSyntaxElement::object_name>("abcde");
-  h.write<eOBJSyntaxElement::object_name>("abcdef");
-  h.write<eOBJSyntaxElement::object_name>("012345678901234567890123456789abcd");
-  h.write<eOBJSyntaxElement::object_name>("123");
-  h.write<eOBJSyntaxElement::curve_element_begin>();
-  h.write<eOBJSyntaxElement::new_line>();
-  h.write<eOBJSyntaxElement::nurbs_parameter_begin>();
-  h.write<eOBJSyntaxElement::new_line>();
+  FormatHandler h(16);
+  h.write_obj_object("abc");
+  h.write_obj_object("abcd");
+  h.write_obj_object("abcde");
+  h.write_obj_object("abcdef");
+  h.write_obj_object("012345678901234567890123456789abcd");
+  h.write_obj_object("123");
+  h.write_obj_curve_begin();
+  h.write_obj_newline();
+  h.write_obj_nurbs_parm_begin();
+  h.write_obj_newline();
 
   size_t got_blocks = h.get_block_count();
   ASSERT_EQ(got_blocks, 7);
@@ -527,4 +527,27 @@ TEST_F(obj_exporter_regression_test, all_objects_mat_groups)
                                _export.params);
 }
 
+TEST_F(obj_exporter_regression_test, materials_without_pbr)
+{
+  OBJExportParamsDefault _export;
+  _export.params.export_normals = false;
+  _export.params.path_mode = PATH_REFERENCE_RELATIVE;
+  compare_obj_export_to_golden("io_tests/blend_geometry/materials_pbr.blend",
+                               "io_tests/obj/materials_without_pbr.obj",
+                               "io_tests/obj/materials_without_pbr.mtl",
+                               _export.params);
+}
+
+TEST_F(obj_exporter_regression_test, materials_pbr)
+{
+  OBJExportParamsDefault _export;
+  _export.params.export_normals = false;
+  _export.params.path_mode = PATH_REFERENCE_RELATIVE;
+  _export.params.export_pbr_extensions = true;
+  compare_obj_export_to_golden("io_tests/blend_geometry/materials_pbr.blend",
+                               "io_tests/obj/materials_pbr.obj",
+                               "io_tests/obj/materials_pbr.mtl",
+                               _export.params);
+}
+
 }  // namespace blender::io::obj