birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/Objects/BaseObject.cpp
-4
View File
@@ -165,7 +165,6 @@ private:
{
CObjectManager* pObjectManager = static_cast<CObjectManager*>(GetIEditor()->GetObjectManager());
CBaseObject* pObject = pObjectManager->FindObject(m_attachedObjectGUID);
CBaseObject* pParentObject = pObjectManager->FindObject(m_parentObjectGUID);
if (pObject)
{
@@ -2818,7 +2817,6 @@ void CBaseObject::SetWorldTM(const Matrix34& tm, int flags)
//////////////////////////////////////////////////////////////////////////
void CBaseObject::UpdateVisibility(bool bVisible)
{
bool bVisibleWithSpec = bVisible && !IsHiddenBySpec();
if (bVisible == CheckFlags(OBJFLAG_INVISIBLE))
{
if (IObjectManager* objectManager = GetObjectManager())
@@ -3180,8 +3178,6 @@ bool CBaseObject::IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayH
return false;
}
int cntSlots = pRenderNode->GetSlotCount();
Matrix34A worldTM;
IStatObj* pStatObj = pRenderNode->GetEntityStatObj(0, 0, &worldTM);
if (!pStatObj)