Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
+6 -3
View File
@@ -184,6 +184,9 @@ void CMission::Export(XmlNodeRef& root, XmlNodeRef& objectsNode)
//objects->setTag( "Objects" );
//root->addChild( objects );
XmlNodeRef envNode = m_environment->clone();
root->addChild(envNode);
m_timeOfDay->setAttr("Time", m_time);
root->addChild(m_timeOfDay);
@@ -262,10 +265,10 @@ void CMission::SyncContent(bool bRetrieve, bool bIgnoreObjects, [[maybe_unused]]
if (GetIEditor()->Get3DEngine())
{
m_numCGFObjects = GetIEditor()->Get3DEngine()->GetLoadedObjectCount();
}
// Load time of day.
GetIEditor()->Get3DEngine()->GetTimeOfDay()->Serialize(m_timeOfDay, true);
// Load time of day.
GetIEditor()->Get3DEngine()->GetTimeOfDay()->Serialize(m_timeOfDay, true);
}
}
else
{