Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -672,7 +672,6 @@ CReflectedVar * ReflectedPropertyControl::GetReflectedVarFromCallbackInstance(Az
        return reinterpret_cast<CReflectedVar *>(pNode->GetInstance(0));
    else
        return GetReflectedVarFromCallbackInstance(pNode->GetParent());
-    return nullptr;
 }