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/usd_writer_mesh.cc | |
| parent | 00f83ec125207e90bf180b3eb7752d8cb6482a86 (diff) | |
| parent | cb6cec904fa14ce0ab10a2a53af5c936d56376cf (diff) | |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
Diffstat (limited to 'source/blender/io/usd/intern/usd_writer_mesh.cc')
| -rw-r--r-- | source/blender/io/usd/intern/usd_writer_mesh.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 74005afaf31..cbf51fc15b3 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -58,7 +58,7 @@ bool USDGenericMeshWriter::is_supported(const HierarchyContext *context) const int base_flag; if (is_dupli) { - /* Construct the object's base flags from its dupliparent, just like is done in + /* Construct the object's base flags from its dupli-parent, just like is done in * deg_objects_dupli_iterator_next(). Without this, the visibility check below will fail. Doing * this here, instead of a more suitable location in AbstractHierarchyIterator, prevents * copying the Object for every dupli. */ |