Skip to content

Updates for Houdini 19 #1242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewkaufman merged 2 commits into from
Feb 17, 2022
Merged

Updates for Houdini 19 #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
663d9b5
Houdini : Update for GCC 9
andrewkaufman Feb 14, 2022
fbc2339
Houdini Tests : Use legacy curve node
andrewkaufman Feb 17, 2022
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
2 changes: 1 addition & 1 deletion src/IECoreHoudini/GEO_CobIOTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ GA_Detail::IOStatus GEO_CobIOTranslator::fileSaveToFile( const GEO_Detail *geo,
WriterPtr writer = Writer::create( object, fileName );
writer->write();
}
catch ( IECore::Exception e )
catch ( IECore::Exception &e )
{
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/IECoreHoudini/NodeHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ OP_Node *NodeHandle::node() const
return node;
}
}
catch( HOM_ObjectWasDeleted )
catch( HOM_ObjectWasDeleted &e )
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/IECoreHoudini/SOP_OpHolder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void SOP_OpHolder::doOperation( IECore::Op *op, const GU_DetailHandle &handle, c
{
result = op->operate();
}
catch( boost::python::error_already_set )
catch( boost::python::error_already_set &e )
{
// \todo: libIECoreHoudini should not use python. Determine if
// this is still required or if the other catch cases are enough.
Expand Down
11 changes: 9 additions & 2 deletions test/IECoreHoudini/FromHoudiniCurvesConverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ def createCurve( self, order=2, periodic=False, parent=None, coordIndex=0 ) :
obj = hou.node("/obj")
parent = obj.createNode("geo", run_init_scripts=False)

curve = parent.createNode( "curve" )
if hou.applicationVersion()[0] >= 19 :
curve = parent.createNode( "curve::" )
else :
curve = parent.createNode( "curve" )

curve.parm( "type" ).set( 1 ) # NURBS
curve.parm( "order" ).set( order )
curve.parm( "close" ).set( periodic )
Expand Down Expand Up @@ -510,7 +514,10 @@ def testAllOpenPolygonsConvertedAsLinearCurves( self ) :
obj = hou.node( "/obj" )
parent = obj.createNode( "geo", run_init_scripts = False )

curves = [parent.createNode( "curve" ), parent.createNode( "curve" ), parent.createNode( "curve" )]
if hou.applicationVersion()[0] >= 19 :
curves = [parent.createNode( "curve::" ), parent.createNode( "curve::" ), parent.createNode( "curve::" )]
else :
curves = [parent.createNode( "curve" ), parent.createNode( "curve" ), parent.createNode( "curve" )]
names = [parent.createNode( "name" ), parent.createNode( "name" ), parent.createNode( "name" )]

curves[0].parm( "type" ).set( 0 ) # polygon
Expand Down
6 changes: 5 additions & 1 deletion test/IECoreHoudini/ToHoudiniCurvesConverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,11 @@ def curveSop( self, order=2, periodic=False, parent=None, coordIndex=0 ) :
obj = hou.node("/obj")
parent = obj.createNode("geo", run_init_scripts=False)

curve = parent.createNode( "curve" )
if hou.applicationVersion()[0] >= 19 :
curve = parent.createNode( "curve::" )
else :
curve = parent.createNode( "curve" )

curve.parm( "type" ).set( 1 ) # NURBS
curve.parm( "order" ).set( order )
curve.parm( "close" ).set( periodic )
Expand Down