Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-01-09 12:51:49 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-01-09 17:46:46 +0300
commitd98b38f97aa07edfbaf81ab07523a1abef585ba1 (patch)
treec288f2539ce31228f2fb2ccbd9983f7b0f8abc49
parent744a58918a0859a782d47ca33c11f6e9f233c044 (diff)
USD Exporter: removed exclusion of 'Holdout' collections
This is in response to @brecht's remark in rBec62413f803e, where he states that the approach was problematically interpreting the holdout setting in a different way than what it was designed to do. If we later want to add back a different "never include this in exports" criterion, it can be easily done in `AbstractHierarchyIterator::mark_as_weak_export()`. If such a criterion should be file-format-specific, it can be done by overriding that function in the file-format-specific subclass.
-rw-r--r--source/blender/usd/intern/abstract_hierarchy_iterator.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
index 3ad2b2ce5d8..957db1a25ef 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
@@ -174,11 +174,6 @@ void AbstractHierarchyIterator::export_graph_construct()
object,
DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY |
DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET) {
- if (object->base_flag & BASE_HOLDOUT) {
- visit_object(object, object->parent, true);
- continue;
- }
-
// Non-instanced objects always have their object-parent as export-parent.
const bool weak_export = mark_as_weak_export(object);
visit_object(object, object->parent, weak_export);