Skip to content

USD 25.05 compatibility #1462

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
murraystevenson merged 2 commits into from
May 1, 2025
Merged

USD 25.05 compatibility #1462

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
bf5ea42
USD PrimitiveAlgo : Fix compilation with USD 25.05
johnhaddon Apr 29, 2025
bf3cb23
IECoreUSDModule : Make compatible with USD 25.05
johnhaddon Apr 29, 2025
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 contrib/IECoreUSD/src/IECoreUSD/PrimitiveAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ bool readPrimitiveVariables( const pxr::UsdSkelRoot &skelRoot, const pxr::UsdGeo
pxr::GfMatrix4d inverseBind = skinningQuery.GetGeomBindTransform( time ).GetInverse();
for( auto &p : points )
{
p = inverseBind.Transform( p );
p = pxr::GfVec3f( inverseBind.Transform( pxr::GfVec3d( p ) ) );
}

Canceller::check( canceller );
Expand Down
41 changes: 41 additions & 0 deletions contrib/IECoreUSD/src/IECoreUSD/bindings/IEUSDModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@

#include "IECore/IndexedIO.h"

#if PXR_VERSION >= 2505
#include "pxr/external/boost/python.hpp"
#endif

#include "boost/python.hpp"

using namespace boost::python;
Expand Down Expand Up @@ -86,10 +90,47 @@ static list fromInternalPath( list l )
return vectorToList( path );
}

#if PXR_VERSION >= 2505

// Registers `boost::python` converters for types
// wrapped using `pxr_boost::python`.
template<typename T>
struct PxrBoostConverter
{

static void registerConverters()
{
boost::python::to_python_converter<T, ToPxrBoost>();
/// \todo Add conversion from Python when we have
/// a use for it. See PyBindConverter for an example.
}

private :

struct ToPxrBoost
{
static PyObject *convert( const T &t )
{
pxr::pxr_boost::python::object o( t );
Py_INCREF( o.ptr() );
return o.ptr();
}
};

};

#endif // PXR_VERSION >= 2505

} // namespace

BOOST_PYTHON_MODULE( _IECoreUSD )
{
#if PXR_VERSION >= 2505
PxrBoostConverter<pxr::TfToken>::registerConverters();
PxrBoostConverter<pxr::VtValue>::registerConverters();
PxrBoostConverter<pxr::SdfValueTypeName>::registerConverters();
#endif

{
object dataAlgoModule( handle<>( borrowed( PyImport_AddModule( "IECoreUSD.DataAlgo" ) ) ) );
scope().attr( "DataAlgo" ) = dataAlgoModule;
Expand Down