diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-05-24 11:24:25 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-05-24 11:24:25 +0300 |
commit | ad27e97ee70e9f26bdd4121b285da3b120d376e0 (patch) | |
tree | ee64fe4a8cce4226bbca469a71b50505b809f710 | |
parent | e20a33b89d75897dd7aa5e296abd756ec4b25db3 (diff) |
Fix T51586: Regression: Alembic containing animated curves / hair no longer working
Also fixed the same type of error when reading points.
-rw-r--r-- | source/blender/alembic/intern/abc_curves.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_points.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc index f54abd6563e..f73fe957fea 100644 --- a/source/blender/alembic/intern/abc_curves.cc +++ b/source/blender/alembic/intern/abc_curves.cc @@ -220,7 +220,7 @@ bool AbcCurveReader::accepts_object_type(const Alembic::AbcCoreAbstract::ObjectH return false; } - if (ob->type != OB_EMPTY) { + if (ob->type != OB_CURVE) { *err_str = "Object type mismatch, Alembic object path points to Curves."; return false; } diff --git a/source/blender/alembic/intern/abc_points.cc b/source/blender/alembic/intern/abc_points.cc index 3a2ca8a1b47..80567cd6bf0 100644 --- a/source/blender/alembic/intern/abc_points.cc +++ b/source/blender/alembic/intern/abc_points.cc @@ -160,7 +160,7 @@ bool AbcPointsReader::accepts_object_type(const Alembic::AbcCoreAbstract::Object return false; } - if (ob->type != OB_EMPTY) { + if (ob->type != OB_MESH) { *err_str = "Object type mismatch, Alembic object path points to Points."; return false; } |