Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -284,7 +284,7 @@ namespace AssetProcessor
                    for (const auto& settingsKey : settingsToCopy)
                    {
                        AZ::SettingsRegistryInterface::FixedValueString settingsValue;
-                        bool settingsCopied = settingsRegistry->Get(settingsValue, settingsKey)
+                        [[maybe_unused]] bool settingsCopied = settingsRegistry->Get(settingsValue, settingsKey)
                            && registry.Set(settingsKey, settingsValue);
                        AZ_Warning("Settings Registry Builder", settingsCopied, "Unable to copy setting %s from AssetProcessor settings registry"
                            " to local settings registry", settingsKey.c_str());