Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2016-09-05 04:46:25 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2016-09-05 04:46:25 +0300
commit569a13f4b2f8d29f1c0796bd0d4df6a0dbe9ac99 (patch)
treef61b7ca7dd7af0345c0fa15b4d142e047c381b9b
parent2024cd09a09afdaac63ca060dc1e0b33eb75fbdc (diff)
Alembic: fix parenting issues when an object has multiple curves/points
subobjects.
-rw-r--r--source/blender/alembic/intern/alembic_capi.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index d057cc341f6..477448f1835 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -599,10 +599,6 @@ struct ImportJobData {
ABC_INLINE bool is_mesh_and_strands(const IObject &object)
{
- if (object.getNumChildren() != 2) {
- return false;
- }
-
bool has_mesh = false;
bool has_curve = false;
@@ -624,6 +620,9 @@ ABC_INLINE bool is_mesh_and_strands(const IObject &object)
else if (ICurves::matches(md)) {
has_curve = true;
}
+ else if (IPoints::matches(md)) {
+ has_curve = true;
+ }
}
return has_mesh && has_curve;