1 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
index 27196994a3c..ad0d6820e2b 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
@@ -145,7 +145,7 @@ TEST_F(AbstractHierarchyIteratorTest, ExportHierarchyTest)
 
   iterator->iterate_and_write();
 
-  // Mapping from object name to set of export paths.
+  /* Mapping from object name to set of export paths. */
   used_writers expected_transforms = {
       {"OBCamera", {"/Camera"}},
       {"OBDupli1", {"/Dupli1"}},
@@ -196,12 +196,12 @@ TEST_F(AbstractHierarchyIteratorTest, ExportHierarchyTest)
 
   EXPECT_EQ(expected_data, iterator->data_writers);
 
-  // The scene has no hair or particle systems.
+  /* The scene has no hair or particle systems. */
   EXPECT_EQ(0, iterator->hair_writers.size());
   EXPECT_EQ(0, iterator->particle_writers.size());
 
-  // On the second iteration, everything should be written as well.
-  // This tests the default value of iterator->export_subset_.
+  /* On the second iteration, everything should be written as well.
+   * This tests the default value of iterator->export_subset_. */
   iterator->transform_writers.clear();
   iterator->data_writers.clear();
   iterator->iterate_and_write();
@@ -211,8 +211,8 @@ TEST_F(AbstractHierarchyIteratorTest, ExportHierarchyTest)
 
 TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest)
 {
-  // The scene has no hair or particle systems, and this is already covered by ExportHierarchyTest,
-  // so not included here. Update this test when hair & particle systems are included.
+  /* The scene has no hair or particle systems, and this is already covered by ExportHierarchyTest,
+   * so not included here. Update this test when hair & particle systems are included. */
 
   /* Load the test blend file. */
   if (!blendfile_load("usd/usd_hierarchy_export_test.blend")) {
@@ -221,7 +221,7 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest)
   depsgraph_create(DAG_EVAL_RENDER);
   iterator_create();
 
-  // Mapping from object name to set of export paths.
+  /* Mapping from object name to set of export paths. */
   used_writers expected_transforms = {
       {"OBCamera", {"/Camera"}},
       {"OBDupli1", {"/Dupli1"}},
@@ -269,10 +269,10 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest)
       {"OBParentOfDupli2", {"/ParentOfDupli2/Icosphere"}},
   };
 
-  // Even when only asking an export of transforms, on the first frame everything should be
-  // exported.
+  /* Even when only asking an export of transforms, on the first frame everything should be
+   * exported. */
   {
-    ExportSubset export_subset = {0};
+    ExportSubset export_subset = {false};
     export_subset.transforms = true;
     export_subset.shapes = false;
     iterator->set_export_subset(export_subset);
@@ -281,22 +281,22 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest)
   EXPECT_EQ(expected_transforms, iterator->transform_writers);
   EXPECT_EQ(expected_data, iterator->data_writers);
 
-  // Clear data to prepare for the next iteration.
+  /* Clear data to prepare for the next iteration. */
   iterator->transform_writers.clear();
   iterator->data_writers.clear();
 
-  // Second iteration, should only write transforms now.
+  /* Second iteration, should only write transforms now. */
   iterator->iterate_and_write();
   EXPECT_EQ(expected_transforms, iterator->transform_writers);
   EXPECT_EQ(0, iterator->data_writers.size());
 
-  // Clear data to prepare for the next iteration.
+  /* Clear data to prepare for the next iteration. */
   iterator->transform_writers.clear();
   iterator->data_writers.clear();
 
-  // Third iteration, should only write data now.
+  /* Third iteration, should only write data now. */
   {
-    ExportSubset export_subset = {0};
+    ExportSubset export_subset = {false};
     export_subset.transforms = false;
     export_subset.shapes = true;
     iterator->set_export_subset(export_subset);
@@ -305,13 +305,13 @@ TEST_F(AbstractHierarchyIteratorTest, ExportSubsetTest)
   EXPECT_EQ(0, iterator->transform_writers.size());
   EXPECT_EQ(expected_data, iterator->data_writers);
 
-  // Clear data to prepare for the next iteration.
+  /* Clear data to prepare for the next iteration. */
   iterator->transform_writers.clear();
   iterator->data_writers.clear();
 
-  // Fourth iteration, should export everything now.
+  /* Fourth iteration, should export everything now. */
   {
-    ExportSubset export_subset = {0};
+    ExportSubset export_subset = {false};
     export_subset.transforms = true;
     export_subset.shapes = true;
     iterator->set_export_subset(export_subset);
@@ -343,7 +343,7 @@ TEST_F(AbstractHierarchyIteratorInvisibleTest, ExportInvisibleTest)
 
   iterator->iterate_and_write();
 
-  // Mapping from object name to set of export paths.
+  /* Mapping from object name to set of export paths. */
   used_writers expected_transforms = {{"OBInvisibleAnimatedCube", {"/InvisibleAnimatedCube"}},
                                       {"OBInvisibleCube", {"/InvisibleCube"}},
                                       {"OBVisibleCube", {"/VisibleCube"}}};
@@ -355,7 +355,7 @@ TEST_F(AbstractHierarchyIteratorInvisibleTest, ExportInvisibleTest)
 
   EXPECT_EQ(expected_data, iterator->data_writers);
 
-  // The scene has no hair or particle systems.
+  /* The scene has no hair or particle systems. */
   EXPECT_EQ(0, iterator->hair_writers.size());
   EXPECT_EQ(0, iterator->particle_writers.size());
 }