diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-07-02 04:40:42 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-07-02 04:40:42 +0300 |
| commit | 8b6a1d6c39df285c0af659c6dca92368284bfe4c (patch) | |
| tree | ad5465fd8b9058228227a53f9a08f30f301def99 /source/blender/io/alembic | |
| parent | e367c3e6e1d75e4ba5238d084e5c99441ad19d72 (diff) | |
| parent | b39d66adde52eb72bd93c2ecd75135fdfc9ca05b (diff) | |
Merge branch 'master' into cycles_procedural_api
Diffstat (limited to 'source/blender/io/alembic')
| -rw-r--r-- | source/blender/io/alembic/intern/abc_customdata.cc | 2 | ||||
| -rw-r--r-- | source/blender/io/alembic/intern/abc_reader_object.cc | 2 | ||||
| -rw-r--r-- | source/blender/io/alembic/intern/alembic_capi.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/alembic/intern/abc_customdata.cc b/source/blender/io/alembic/intern/abc_customdata.cc index eccb529e4d0..e3ed897458d 100644 --- a/source/blender/io/alembic/intern/abc_customdata.cc +++ b/source/blender/io/alembic/intern/abc_customdata.cc @@ -497,7 +497,7 @@ void read_generated_coordinates(const ICompoundProperty &prop, const CDStreamConfig &config, const Alembic::Abc::ISampleSelector &iss) { - if (prop.getPropertyHeader(propNameOriginalCoordinates) == nullptr) { + if (!prop.valid() || prop.getPropertyHeader(propNameOriginalCoordinates) == nullptr) { /* The ORCO property isn't there, so don't bother trying to process it. */ return; } diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index fce7a0505fd..60fd78dca48 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -210,7 +210,7 @@ void AbcObjectReader::setupObjectTransform(const float time) Alembic::AbcGeom::IXform AbcObjectReader::xform() { - /* Check that we have an empty object (locator, bone head/tail...). */ + /* Check that we have an empty object (locator, bone head/tail...). */ if (IXform::matches(m_iobject.getMetaData())) { try { return IXform(m_iobject, Alembic::AbcGeom::kWrapExisting); diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index 964c56ef51e..e0c5d903b01 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -770,7 +770,7 @@ void ABC_get_transform(CacheReader *reader, float r_mat_world[4][4], float time, /* Convert from the local matrix we obtain from Alembic to world coordinates * for Blender. This conversion is done here rather than by Blender due to * work around the non-standard interpretation of CONSTRAINT_SPACE_LOCAL in - * BKE_constraint_mat_convertspace(). */ + * BKE_constraint_mat_convertspace(). */ Object *object = abc_reader->object(); if (object->parent == nullptr) { /* No parent, so local space is the same as world space. */ |