[Bf-blender-cvs] [ad27e97ee70] master: Fix T51586: Regression: Alembic containing animated curves / hair no longer working
Sybren A. Stüvel
noreply at git.blender.org
Wed May 24 10:25:19 CEST 2017
Commit: ad27e97ee70e9f26bdd4121b285da3b120d376e0
Author: Sybren A. Stüvel
Date: Wed May 24 10:24:25 2017 +0200
Branches: master
https://developer.blender.org/rBad27e97ee70e9f26bdd4121b285da3b120d376e0
Fix T51586: Regression: Alembic containing animated curves / hair no longer working
Also fixed the same type of error when reading points.
===================================================================
M source/blender/alembic/intern/abc_curves.cc
M source/blender/alembic/intern/abc_points.cc
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list