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
3 changes: 3 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
10.6.x.x (relative to 10.6.4.0)
========

Improvements
------------

- USDScene : Added loading of ArnoldProcedural prims as Cortex ExternalProcedural objects.

10.6.4.0 (relative to 10.6.3.1)
========
Expand Down
6 changes: 6 additions & 0 deletions contrib/IECoreUSD/src/IECoreUSD/ArnoldProceduralAlgo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ namespace
const pxr::TfToken g_arnold( "arnold" );
const pxr::TfToken g_arnoldAlembic( "ArnoldAlembic" );
const pxr::TfToken g_arnoldNodeEntry( "arnold:node_entry" );
const pxr::TfToken g_arnoldProcedural( "ArnoldProcedural" );
const pxr::TfToken g_arnoldProceduralCustom( "ArnoldProceduralCustom" );
const pxr::TfToken g_arnoldUsd( "ArnoldUsd" );

Expand Down Expand Up @@ -87,6 +88,10 @@ IECore::ObjectPtr readArnoldProcedural( pxr::UsdGeomGprim &gprim, pxr::UsdTimeCo
gprim.GetPrim().GetAttribute( g_arnoldNodeEntry ).Get( &nodeEntry, time );
result->setFileName( nodeEntry );
}
else if( gprim.GetPrim().IsA( g_arnoldProcedural ) )
{
result->setFileName( "procedural" );
}
else if( gprim.GetPrim().IsA( g_arnoldUsd ) )
{
result->setFileName( "usd" );
Expand Down Expand Up @@ -157,6 +162,7 @@ bool arnoldProceduralMightBeTimeVarying( pxr::UsdGeomGprim &gprim )
}

ObjectAlgo::ReaderDescription<pxr::UsdGeomGprim> g_arnoldAlembicReaderDescription( g_arnoldAlembic, readArnoldProcedural, arnoldProceduralMightBeTimeVarying );
ObjectAlgo::ReaderDescription<pxr::UsdGeomGprim> g_arnoldProceduralReaderDescription( g_arnoldProcedural, readArnoldProcedural, arnoldProceduralMightBeTimeVarying );
ObjectAlgo::ReaderDescription<pxr::UsdGeomGprim> g_arnoldProceduralCustomReaderDescription( g_arnoldProceduralCustom, readArnoldProcedural, arnoldProceduralMightBeTimeVarying );
ObjectAlgo::ReaderDescription<pxr::UsdGeomGprim> g_arnoldUsdReaderDescription( g_arnoldUsd, readArnoldProcedural, arnoldProceduralMightBeTimeVarying );

Expand Down
Loading