Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures

2021-11-16 10:06:28 -08:00
parent 224e0bd20f c3dacb1e52
commit db3d41ad9d
143 changed files with 1014 additions and 1749 deletions
@@ -60,7 +60,7 @@ namespace AZ
            }
        }

-        AZStd::sys_time_t ShaderVariantAsset::GetBuildTimestamp() const
+        AZ::u64 ShaderVariantAsset::GetBuildTimestamp() const
        {
            return m_buildTimestamp;
        }