diff options
author | Julian Eisel <julian@blender.org> | 2020-03-12 17:58:03 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-12 17:58:03 +0300 |
commit | b86be9b2145458037fd0b17433b7af0efa7b6472 (patch) | |
tree | f333625555402992ebb35d258f93eda1130389e6 /source/blender/io/usd/intern/abstract_hierarchy_iterator.h | |
parent | 00f83ec125207e90bf180b3eb7752d8cb6482a86 (diff) | |
parent | cb6cec904fa14ce0ab10a2a53af5c936d56376cf (diff) |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
Diffstat (limited to 'source/blender/io/usd/intern/abstract_hierarchy_iterator.h')
-rw-r--r-- | source/blender/io/usd/intern/abstract_hierarchy_iterator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h index 8bca2ddd447..c121e3b704d 100644 --- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h @@ -65,8 +65,8 @@ struct HierarchyContext { /* When weak_export=true, the object will be exported only as transform, and only if is an * ancestor of an object with weak_export=false. * - * In other words: when weak_export=true but this object has no children, or all decendants also - * have weak_export=true, this object (and by recursive reasoning all its decendants) will be + * In other words: when weak_export=true but this object has no children, or all descendants also + * have weak_export=true, this object (and by recursive reasoning all its descendants) will be * excluded from the export. * * The export hierarchy is kept as close to the the hierarchy in Blender as possible. As such, an @@ -222,7 +222,7 @@ class AbstractHierarchyIterator { * * When this returns true, only a transform writer is created and marked as * 'weak export'. In this case, the transform writer will be removed before - * exporting starts, unless a decendant of this object is to be exported. + * exporting starts, unless a descendant of this object is to be exported. * Dupli-object generated from this object will also be skipped. * * See HierarchyContext::weak_export. |