Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

2021-07-14 13:00:53 -07:00
parent c6f03cbb09 ffcfa44b49
commit 7aab45cbea
48 changed files with 1395 additions and 1180 deletions
@@ -116,7 +116,7 @@ namespace AZ
                {
                    const char* uuidString = nullptr;
                    unsigned int uuidStringLength = 0;
-                    if (dc.ReadArg(0, uuidString) && dc.ReadValue(1, uuidStringLength))
+                    if (dc.ReadArg(0, uuidString) && dc.ReadArg(1, uuidStringLength))
                    {
                        dc.PushResult(Uuid(uuidString, uuidStringLength));
                    }