Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,10 @@ namespace AzToolsFramework
for (auto componentToRemove : componentsToRemove)
{
AZ::Entity* entity = componentToRemove->GetEntity();

if (!entity) //gosha_bmk10 7/14/2019 , add 2 same compens, then delete 1. for using Auth Server in Character Multiplayer. "{3097BBE1-CCAA-46B5-B027-121A4588C036}"
{
continue;
}
bool isEntityEditable = false;
EBUS_EVENT_RESULT(isEntityEditable, AzToolsFramework::ToolsApplicationRequests::Bus, IsEntityEditable, entity->GetId());
if (!isEntityEditable)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,12 @@ namespace EMotionFX
{
return;
}

if (!actor) // 7/8/2019 Georgiy Chipunov - Fix crash in Editor, trying to animate jack.
{
return;
}// to replicate the crash make new actor, new motions , new animt, new motions, and close editor, while its saved new action, will decal actor beefore running code.

// Run finder..
const Node* targetNode = actor->GetSkeleton()->FindNodeByName(m_targetNodeName.c_str());
if (!targetNode)
{
Expand Down Expand Up @@ -498,4 +503,4 @@ namespace EMotionFX
->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
;
}
} // namespace EMotionFX
} // namespace EMotionFX
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ namespace EMStudio
mDock->disconnect(this);

EMStudio::GetMainWindow()->removeDockWidget(mDock);
delete mDock;
// delete mDock;
// delete mDock; // I don't care what memory leaks, cause this to break, but its bigger than me right now to fix
// 7/8/2019 - I just want to stop crashing, quick fix. tempfix w\e.
// Critical error detected c0000374 Editor.exe has triggered a breakpoint.
}
}

Expand Down