Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/IECoreHoudini/FromHoudiniPolygonsConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ ObjectPtr FromHoudiniPolygonsConverter::doDetailConversion( const GU_Detail *geo
if ( attrHandle.isAttributeValid() )
{
modifiedOperands = operands->copy();
modifiedOperands->member<StringData>( "attributeFilter" )->writable() += " ^ieMeshInterpolation";
std::string &attributeFilter = modifiedOperands->member<StringData>( "attributeFilter" )->writable();
attributeFilter += " ^ieMeshInterpolation";

GA_Range primRange = geo->getPrimitiveRange();
const GA_ROAttributeRef attrRef( attrHandle.getAttribute() );
Expand All @@ -137,6 +138,9 @@ ObjectPtr FromHoudiniPolygonsConverter::doDetailConversion( const GU_Detail *geo
if ( !strcmp( value, "subdiv" ) )
{
interpolation = "catmullClark";
// subdivision meshes should not have normals. we assume this occurred because the geo contained
// both subdiv and linear meshes, inadvertantly extending the normals attribute to both.
attributeFilter += " ^N";
break;
}
else if ( !strcmp( value, "poly" ) )
Expand Down
9 changes: 7 additions & 2 deletions test/IECoreHoudini/FromHoudiniPolygonsConverter.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,23 +788,28 @@ def testStandardAttributeConversion( self ) :
def testInterpolation( self ) :

torus = self.createTorus()
result = IECoreHoudini.FromHoudiniPolygonsConverter( torus ).convert()
normals = torus.createOutputNode( "facet" )
normals.parm( "postnml" ).set( True )
result = IECoreHoudini.FromHoudiniPolygonsConverter( normals ).convert()
self.assertTrue( "ieMeshInterpolation" not in result.keys() )
self.assertEqual( result.interpolation, "linear" )
self.assertTrue( "N" in result.keys() )

attr = torus.createOutputNode( "attribcreate", node_name = "interpolation", exact_type_name=True )
attr = normals.createOutputNode( "attribcreate", node_name = "interpolation", exact_type_name=True )
attr.parm( "name" ).set( "ieMeshInterpolation" )
attr.parm( "class" ).set( 1 ) # prim
attr.parm( "type" ).set( 3 ) # string
attr.parm( "string") .set( "subdiv" )
result = IECoreHoudini.FromHoudiniPolygonsConverter( attr ).convert()
self.assertTrue( "ieMeshInterpolation" not in result.keys() )
self.assertEqual( result.interpolation, "catmullClark" )
self.assertTrue( "N" not in result.keys() )

attr.parm( "string") .set( "poly" )
result = IECoreHoudini.FromHoudiniPolygonsConverter( attr ).convert()
self.assertTrue( "ieMeshInterpolation" not in result.keys() )
self.assertEqual( result.interpolation, "linear" )
self.assertTrue( "N" in result.keys() )

if __name__ == "__main__":
unittest.main()