Merge branch 'development' into Prefab/IncreaseReadFileSizeLimit

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-09 09:09:04 -07:00
parent a80314f84a d82b2a0608
commit 546ce377f0
49 changed files with 5126 additions and 6360 deletions
@@ -46,7 +46,7 @@ namespace AZ
    {
        namespace ShaderBuilderUtility
        {
-            static constexpr char ShaderBuilderUtilityName[] = "ShaderBuilderUtility";
+            [[maybe_unused]] static constexpr char ShaderBuilderUtilityName[] = "ShaderBuilderUtility";

            Outcome<RPI::ShaderSourceData, AZStd::string> LoadShaderDataJson(const AZStd::string& fullPathToJsonFile)
            {