Skip to content
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

Fixes an issue on layer editor when trying to save a root layer directly (by right clicking on the layer and Save As.), where an invalid extension could cause a crash. The fallback is .usd. #2847

Merged
merged 4 commits into from
Jan 27, 2023
Merged

Fixes an issue on layer editor when trying to save a root layer directly (by right clicking on the layer and Save As.), where an invalid extension could cause a crash. The fallback is .usd. #2847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2948693
Fixes an issue on layer editor when trying to save a root layer direc…
AramAzhari-adsk Jan 26, 2023
6ab859e
Merge branch 'dev' into azharia/MAYA-127327/usd-layer-editor-rootlaye…
AramAzhari-adsk Jan 26, 2023
499d11e
Created a function for common code that check USD file extension corr…
AramAzhari-adsk Jan 26, 2023
2592f5c
Removed the redundant hearder include.
AramAzhari-adsk Jan 26, 2023
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
23 changes: 14 additions & 9 deletions lib/mayaUsd/utils/utilSerialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,8 @@ SdfLayerRefPtr saveAnonymousLayer(
return nullptr;
}

std::string filePath(path);
const std::string& extension = SdfFileFormat::GetFileExtension(filePath);
const std::string defaultExt(UsdMayaTranslatorTokens->UsdFileExtensionDefault.GetText());
const std::string usdCrateExt(UsdMayaTranslatorTokens->UsdFileExtensionCrate.GetText());
const std::string usdASCIIExt(UsdMayaTranslatorTokens->UsdFileExtensionASCII.GetText());
if (extension != defaultExt && extension != usdCrateExt && extension != usdASCIIExt) {
filePath.append(".");
filePath.append(defaultExt.c_str());
}
std::string filePath(path);
ensureUSDFileExtension(filePath);

saveLayerWithFormat(anonLayer, filePath, formatArg);

Expand All @@ -313,6 +306,18 @@ SdfLayerRefPtr saveAnonymousLayer(
return newLayer;
}

void ensureUSDFileExtension(std::string& filePath)
{
const std::string& extension = SdfFileFormat::GetFileExtension(filePath);
const std::string defaultExt(UsdMayaTranslatorTokens->UsdFileExtensionDefault.GetText());
const std::string usdCrateExt(UsdMayaTranslatorTokens->UsdFileExtensionCrate.GetText());
const std::string usdASCIIExt(UsdMayaTranslatorTokens->UsdFileExtensionASCII.GetText());
if (extension != defaultExt && extension != usdCrateExt && extension != usdASCIIExt) {
filePath.append(".");
filePath.append(defaultExt.c_str());
}
}

void getLayersToSaveFromProxy(const std::string& proxyPath, stageLayersToSave& layersInfo)
{
auto stage = UsdMayaUtil::GetStageByProxyName(proxyPath);
Expand Down
7 changes: 6 additions & 1 deletion lib/mayaUsd/utils/utilSerialization.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ PXR_NS::SdfLayerRefPtr saveAnonymousLayer(
LayerParent parent,
std::string formatArg = "");

/*! \brief Check the sublayer stack of the stage looking for any anonymnous
/*! \brief Ensures that the filepath contains a valid USD extension.
*/
MAYAUSD_CORE_PUBLIC
void ensureUSDFileExtension(std::string& filePath);

/*! \brief Check the sublayer stack of the stage looking for any anonymous
layers that will need to be saved.
*/
MAYAUSD_CORE_PUBLIC
Expand Down
5 changes: 4 additions & 1 deletion lib/usd/ui/layerEditor/layerTreeItem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,10 @@ void LayerTreeItem::saveAnonymousLayer()

std::string fileName;
if (sessionState->saveLayerUI(nullptr, &fileName)) {
// the path we has is an absolute path

MayaUsd::utils::ensureUSDFileExtension(fileName);

// the path we have is an absolute path
const QString dialogTitle = StringResources::getAsQString(StringResources::kSaveLayer);
std::string formatTag = MayaUsd::utils::usdFormatArgOption();
if (saveSubLayer(dialogTitle, parentLayerItem(), layer(), fileName, formatTag)) {
Expand Down