Skip to content

SceneCacheData.cpp: expansionRule token removed from header in USD 22.03 #1245

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 1 commit into from
Mar 2, 2022
Merged

SceneCacheData.cpp: expansionRule token removed from header in USD 22.03 #1245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion contrib/IECoreUSD/src/IECoreUSD/SceneCacheData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ static InternedString g_ioIndices( "indices" );
static const SceneInterface::Path g_mayaFpsHeaderPath = { "header", "data", "CompoundObject", "data", "members", "maya", "data", "CompoundDataBase", "data", "members", "frameRate", "data"};
static const SceneInterface::Path g_houdiniFpsHeaderPath = { "header", "data", "CompoundObject", "data", "members", "houdini", "data", "CompoundDataBase", "data", "members", "frameRate", "data"};
static const VtValue g_empty = VtValue();
static const InternedString g_expansionRule( "expansionRule" );
} // namespace


Expand Down Expand Up @@ -1112,7 +1113,7 @@ void SceneCacheData::addCollections( SpecData& spec, TfTokenVector& properties,
collectionList.push_back( TfToken( boost::str( boost::format( "CollectionAPI:%s" ) % safeCollectionName ) ) );

// expansion rule
TfToken expansionRuleName( boost::str( boost::format( "collection:%s:%s" ) % safeCollectionName % UsdTokens->expansionRule.GetString() ) );
TfToken expansionRuleName( boost::str( boost::format( "collection:%s:%s" ) % safeCollectionName % g_expansionRule ) );
addProperty(
properties,
primPath,
Expand Down