Commit: 2193e28dfc05d08f96b91a9b010b4c5de75f948d
Author: Sergey Sharybin
Date: Fri Jun 19 12:33:59 2020 +0200
Branches: master
https://developer.blender.org/rB2193e28dfc05d08f96b91a9b010b4c5de75f948d
USD Test: Don't use designated initializers
This isn't really in C++ standard, some corner cases work in some
compilers (like when all fields are specified), but in general they
do not work.
For some reason MSVC builder started to complain about it now,
weird but better not rely on compiler specifics.
===================================================================
M tests/gtests/usd/abstract_hierarchy_iterator_test.cc
===================================================================
diff --git a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
index 1ca0ad93470..d9148a7b289 100644
--- a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
+++ b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
@@ -276,10 +276,12 @@ TEST_F(USDHierarchyIteratorTest, ExportSubsetTest)
// Even when only asking an export of transforms, on the first frame
everything should be
// exported.
- iterator->set_export_subset({
- .transforms = true,
- .shapes = false,
- });
+ {
+ ExportSubset export_subset = {0};
+ export_subset.transforms = true;
+ export_subset.shapes = false;
+ iterator->set_export_subset(export_subset);
+ }
iterator->iterate_and_write();
EXPECT_EQ(expected_transforms, iterator->transform_writers);
EXPECT_EQ(expected_data, iterator->data_writers);
@@ -298,10 +300,12 @@ TEST_F(USDHierarchyIteratorTest, ExportSubsetTest)
iterator->data_writers.clear();
// Third iteration, should only write data now.
- iterator->set_export_subset({
- .transforms = false,
- .shapes = true,
- });
+ {
+ ExportSubset export_subset = {0};
+ export_subset.transforms = false;
+ export_subset.shapes = true;
+ iterator->set_export_subset(export_subset);
+ }
iterator->iterate_and_write();
EXPECT_EQ(0, iterator->transform_writers.size());
EXPECT_EQ(expected_data, iterator->data_writers);
@@ -311,10 +315,12 @@ TEST_F(USDHierarchyIteratorTest, ExportSubsetTest)
iterator->data_writers.clear();
// Fourth iteration, should export everything now.
- iterator->set_export_subset({
- .transforms = true,
- .shapes = true,
- });
+ {
+ ExportSubset export_subset = {0};
+ export_subset.transforms = true;
+ export_subset.shapes = true;
+ iterator->set_export_subset(export_subset);
+ }
iterator->iterate_and_write();
EXPECT_EQ(expected_transforms, iterator->transform_writers);
EXPECT_EQ(expected_data, iterator->data_writers);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
