Merge branch 'main' into ly-as-sdk/LYN-2948

2021-05-13 11:25:03 -05:00
parent 749df7d977 795aa114e6
commit debbfc38d8
1224 changed files with 18773 additions and 126359 deletions
@@ -1809,8 +1809,6 @@ XmlNodeRef XmlParserImp::ParseFile(const char* filename, XmlString& errorString,
        ParseEnd();
    }

-    SYNCHRONOUS_LOADING_TICK();
-
    delete [] pFileContents;

    return root;