Merge branch 'main' into LY-110648

2021-04-30 14:30:06 +01:00
parent 63526655a2 aa5ddbf532
commit 544b2a087f
141 changed files with 8381 additions and 1481 deletions
@@ -713,7 +713,7 @@ namespace AssetUtilities
        }

        // Update Settings Registry with new token
-        AZStd::string azNewAllowedList{ newAllowedList.join(', ').toUtf8().constData() };
+        AZStd::string azNewAllowedList{ newAllowedList.join(',').toUtf8().constData() };
        settingsRegistry->Set(allowedListKey, azNewAllowedList);

        return AssetUtilsInternal::DumpAssetProcessorUserSettingsToFile(*settingsRegistry, assetProcessorUserSetregPath);