birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4838 from aws-lumberyard-dev/LYN-7562

Browse Source 
Make safe asset folder comparison for prefab creation to be case insensitive
This commit is contained in:
Nicholas Van Sickle
2021-10-21 14:37:53 -07:00
committed by GitHub
parent ea442b80d1 33490ed6df
commit f3af362ede
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp
+6 -7
View File
@@ -2648,16 +2648,15 @@ namespace AzToolsFramework
}
else
{
QString cleanSaveAs(QDir::cleanPath(slicePath));
AZ::IO::FixedMaxPath lexicallyNormalPath = AZ::IO::PathView(slicePath.toUtf8().constData()).LexicallyNormal();
bool isPathSafeForAssets = false;
for (AZStd::string assetSafeFolder : assetSafeFolders)
for (const AZStd::string& assetSafeFolder : assetSafeFolders)
{
QString cleanAssetSafeFolder(QDir::cleanPath(assetSafeFolder.c_str()));
// Compare using clean paths so slash direction does not matter.
// Note that this comparison is case sensitive because some file systems
// Open 3D Engine supports are case sensitive.
if (cleanSaveAs.startsWith(cleanAssetSafeFolder))
AZ::IO::PathView assetSafeFolderView(assetSafeFolder);
// Check if the slice path is relative to the safe asset directory.
// The Path classes are being used to make this check case insensitive.
if (lexicallyNormalPath.IsRelativeTo(assetSafeFolderView))
{
isPathSafeForAssets = true;
break;
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
+6 -7
View File
@@ -805,16 +805,15 @@ namespace AzToolsFramework
}
else
{
QString cleanSaveAs(QDir::cleanPath(prefabPath));
AZ::IO::FixedMaxPath lexicallyNormalPath = AZ::IO::PathView(prefabPath.toUtf8().constData()).LexicallyNormal();
bool isPathSafeForAssets = false;
for (AZStd::string assetSafeFolder : assetSafeFolders)
for (const AZStd::string& assetSafeFolder : assetSafeFolders)
{
QString cleanAssetSafeFolder(QDir::cleanPath(assetSafeFolder.c_str()));
// Compare using clean paths so slash direction does not matter.
// Note that this comparison is case sensitive because some file systems
// Open 3D Engine supports are case sensitive.
if (cleanSaveAs.startsWith(cleanAssetSafeFolder))
AZ::IO::PathView assetSafeFolderView(assetSafeFolder);
// Check if the prefabPath is relative to the safe asset directory.
// The Path classes are being used to make this check case insensitive.
if (lexicallyNormalPath.IsRelativeTo(assetSafeFolderView))
{
isPathSafeForAssets = true;
break;