Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -250,7 +250,8 @@ bool CLinkTool::ChildIsValid(CBaseObject* pParent, CBaseObject* pChild, int nDir
    CBaseObject* pObj;
    if (nDir & 1)
    {
-        if (pObj = pChild->GetParent())
+        pObj = pChild->GetParent();
+        if (pObj)
        {
            if (!ChildIsValid(pParent, pObj, 1))
            {
@@ -262,7 +263,8 @@ bool CLinkTool::ChildIsValid(CBaseObject* pParent, CBaseObject* pChild, int nDir
    {
        for (int i = 0; i < pChild->GetChildCount(); i++)
        {
-            if (pObj = pChild->GetChild(i))
+            pObj = pChild->GetChild(i);
+            if (pObj)
            {
                if (!ChildIsValid(pParent, pObj, 2))
                {