Merge pull request #434 from johnhaddon/alembicFaceSets

AlembicInput : Fixed bug where face sets were treated as children.

Author: andrewkaufman

contrib/IECoreAlembic/src/IECoreAlembic/AlembicInput.cpp

@@ -402,6 +402,19 @@ IECore::ObjectPtr AlembicInput::objectAtTime( double time, IECore::TypeId result
 
 size_t AlembicInput::numChildren() const
 {
+	if(
+		!IXform::matches( m_data->object.getMetaData() ) &&
+		m_data->object.getParent()
+	)
+	{
+		// not a transform, and not the top of the archive.
+		// we want to ignore any children, because they won't
+		// be something we consider part of the hierarchy -
+		// alembic implements face sets as objects parented to
+		// a mesh for instance, whereas we would just think
+		// of them as a property of the mesh.
+		return 0;
+	}
 	return m_data->object.getNumChildren();
 }
 
@@ -421,7 +434,7 @@ IECore::StringVectorDataPtr AlembicInput::childNames() const
 {
 	StringVectorDataPtr resultData = new StringVectorData;
 	std::vector<std::string> &resultVector = resultData->writable();
-	size_t numChildren = m_data->object.getNumChildren();
+	size_t numChildren = this->numChildren();
 	for( size_t i=0; i<numChildren; i++ )
 	{
 		resultVector.push_back( m_data->object.getChildHeader( i ).getName() );

contrib/IECoreAlembic/test/IECoreAlembic/AlembicInputTest.py

@@ -449,6 +449,18 @@ def testCamera( self ) :
 
 		c = a.child( "persp" ).child( "perspShape" ).objectAtTime( 0 )
 		self.failUnless( isinstance( c, IECore.Camera ) )		
-		
+
+	def testHierarchyIgnoresShadingGroups( self ) :
+
+		a = IECoreAlembic.AlembicInput( os.path.dirname( __file__ ) + "/data/sphereWithShadingGroups.abc" )
+		self.assertEqual( a.numChildren(), 1 )
+		self.assertEqual( a.childNames(), IECore.StringVectorData( [ "pSphere1" ] ) )
+
+		g = a.child( "pSphere1" )
+		m = g.child( "pSphereShape1" )
+
+		self.assertEqual( m.numChildren(), 0 )
+		self.assertEqual( m.childNames(), IECore.StringVectorData() )
+
 if __name__ == "__main__":
     unittest.main()