[7aab62ec75e] temp-sybren-usd-patch-01: USD: iterate() â iterate_and_write()
Sybren A. Stüvel
noreply at git.blender.org
Tue Nov 26 18:22:53 CET 2019
Commit: 7aab62ec75e9b11d1380347afc730cd8634e5a5b
Author: Sybren A. Stüvel
Date: Tue Nov 26 14:03:24 2019 +0100
Branches: temp-sybren-usd-patch-01
https://developer.blender.org/rB7aab62ec75e9b11d1380347afc730cd8634e5a5b
USD: iterate() → iterate_and_write()
===================================================================
M source/blender/usd/intern/abstract_hierarchy_iterator.cc
M source/blender/usd/intern/abstract_hierarchy_iterator.h
M source/blender/usd/intern/usd_capi.cc
M tests/gtests/usd/abstract_hierarchy_iterator_test.cc
===================================================================
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
index a55ad097725..825a26dec8a 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
@@ -82,7 +82,7 @@ AbstractHierarchyIterator::~AbstractHierarchyIterator()
{
}
-void AbstractHierarchyIterator::iterate()
+void AbstractHierarchyIterator::iterate_and_write()
{
export_graph_construct();
export_graph_prune();
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h b/source/blender/usd/intern/abstract_hierarchy_iterator.h
index 9e8c6775095..b58a98d0f6f 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.h
@@ -149,7 +149,7 @@ class AbstractHierarchyIterator {
/* Iterate over the depsgraph, create writers, and tell the writers to write.
* Main entry point for the AbstractHierarchyIterator, must be called for every to-be-exported
* frame. */
- void iterate();
+ void iterate_and_write();
/* Release all writers. Call after all frames have been exported. */
void release_writers();
diff --git a/source/blender/usd/intern/usd_capi.cc b/source/blender/usd/intern/usd_capi.cc
index 1c2e28f04c1..9f807d05968 100644
--- a/source/blender/usd/intern/usd_capi.cc
+++ b/source/blender/usd/intern/usd_capi.cc
@@ -119,7 +119,7 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo
BKE_scene_graph_update_for_newframe(data->depsgraph, data->bmain);
iter.set_export_frame(frame);
- iter.iterate();
+ iter.iterate_and_write();
*progress += progress_per_frame;
*do_update = true;
@@ -127,7 +127,7 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo
}
else {
// If we're not animating, a single iteration over all objects is enough.
- iter.iterate();
+ iter.iterate_and_write();
}
iter.release_writers();
diff --git a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
index 915e67cc50a..08fefe255f3 100644
--- a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
+++ b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
@@ -141,7 +141,7 @@ TEST_F(USDHierarchyIteratorTest, ExportHierarchyTest)
depsgraph_create(DAG_EVAL_RENDER);
iterator_create();
- iterator->iterate();
+ iterator->iterate_and_write();
// Mapping from object name to set of export paths.
created_writers expected_xforms = {
More information about the Bf-blender-cvs
mailing list