swg-source/client-tools
1
0
Fork 0
mirror of https://github.com/SWG-Source/client-tools.git synced 2026-10-13 05:12:52 -04:00
Code Issues Projects Releases Wiki Activity

Update Fix for CuiWidget3dObjectListViewer [E]

Browse Source 
ty Geit
This commit is contained in:
AconiteX
2021-05-30 00:08:06 -04:00
parent e5c9ef5b55
commit e5536f6837
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.cpp
+1 -1
View File
@@ -2708,7 +2708,7 @@ void CuiWidget3dObjectListViewer::addObject (Object & obj)
if (hasFlags (F_alterObjects))
{
if (obj.isInitialized() && (obj.alter(Clock::frameTime()) != AlterResult::cms_kill))
if (obj.isInitialized() && !obj.isInWorld() && (obj.alter(Clock::frameTime()) != AlterResult::cms_kill))
{
obj.conclude();
}
src/engine/shared/library/sharedObject/src/shared/ObjectWatcherList.cpp
+1 -1
View File
@@ -222,7 +222,7 @@ void ObjectWatcherList::alter(real time)
// is removed from the list withing its alter()
Object * const obj = (*m_alterSafeObjectVector)[i];
if (!obj || !obj->isInitialized())
if (!obj || !obj->isInitialized() || obj->isInWorld())
continue;
float const alterResult = obj->alter(time);