Fix T51586: Regression: Alembic containing animated curves / hair no longer working
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 24 May 2017 08:24:25 +0000 (10:24 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 24 May 2017 08:24:25 +0000 (10:24 +0200)
Also fixed the same type of error when reading points.

source/blender/alembic/intern/abc_curves.cc
source/blender/alembic/intern/abc_points.cc

index f54abd6563ece5009c0591252dab58399c2c7683..f73fe957fea8a7a278ed4f75a1f8998a6c62d537 100644 (file)
@@ -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;
        }
index 3a2ca8a1b47adf3a0f7a931d6ddd233e6c09215b..80567cd6bf0ac81b43629827322a385717880698 100644 (file)
@@ -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;
        }