Merge commit 'b0dfe26232b318e520887af65cd579ec87016636' into amzn-tommy/gitflow_211116_o3de2

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-16 11:45:09 -08:00
parent e44fa2a52a b0dfe26232
commit 0dcf49affc
50 changed files with 19 additions and 19 deletions
@@ -92,7 +92,7 @@ namespace AZ
        /////////////////////////////////////////////////////////////////////
        // Methods for all shader variant types

-        void ShaderVariantAssetCreator::SetBuildTimestamp(AZStd::sys_time_t buildTimestamp)
+        void ShaderVariantAssetCreator::SetBuildTimestamp(AZ::u64 buildTimestamp)
        {
            if (ValidateIsReady())
            {