diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
commit | 49ee1a97d2704d8cc707201675a919b9ef103fec (patch) | |
tree | 17c78db252f4b24297490de623fe5f303cea181a /source/blender/alembic/intern/abc_object.cc | |
parent | 292a2802ad376f4a3a2cc7bed763d0f5856dd98c (diff) | |
parent | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern/abc_object.cc')
-rw-r--r-- | source/blender/alembic/intern/abc_object.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc index 98ebcf6debb..aa4e390fa71 100644 --- a/source/blender/alembic/intern/abc_object.cc +++ b/source/blender/alembic/intern/abc_object.cc @@ -291,7 +291,8 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform() /* The archive's top object can be recognised by not having a parent. */ if (abc_parent.getParent() - && IXform::matches(abc_parent.getMetaData())) { + && IXform::matches(abc_parent.getMetaData())) + { return IXform(abc_parent, Alembic::AbcGeom::kWrapExisting); } |