[Bf-blender-cvs] [579e8c7] blender-v2.78-release: Alembic: fix parenting issues when an object has multiple curves/points subobjects.

Kévin Dietrich noreply at git.blender.org
Wed Sep 14 10:38:05 CEST 2016


Commit: 579e8c707b677edb61be5ed4e04577823b3137dc
Author: Kévin Dietrich
Date:   Mon Sep 5 03:46:25 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rB579e8c707b677edb61be5ed4e04577823b3137dc

Alembic: fix parenting issues when an object has multiple curves/points
subobjects.

===================================================================

M	source/blender/alembic/intern/alembic_capi.cc

===================================================================

diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index d057cc3..477448f 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;




More information about the Bf-blender-cvs mailing list