Integrating github/staging through commit ab87ed9

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
@@ -422,22 +422,22 @@ bool CStatCGFCompiler::DebugDumpCGF(const char* sourceFileName, const char* outp
}
{
const CPhysicalizeInfoCGF* pPhys = pCGF->GetPhysicalizeInfo();
//const CPhysicalizeInfoCGF* pPhys = pCGF->GetPhysicalizeInfo();
fprintf(f, "\t" "PhysicalizeInfo: (not printed yet)\n");
}
{
CExportInfoCGF* pExport = pCGF->GetExportInfo();
//CExportInfoCGF* pExport = pCGF->GetExportInfo();
fprintf(f, "\t" "ExportInfo: (not printed yet)\n");
}
{
CSkinningInfo* pSkin = pCGF->GetSkinningInfo();
//CSkinningInfo* pSkin = pCGF->GetSkinningInfo();
fprintf(f, "\t" "SkinningInfo: (not printed yet)\n");
}
{
SFoliageInfoCGF* pSkin = pCGF->GetFoliageInfo();
//SFoliageInfoCGF* pSkin = pCGF->GetFoliageInfo();
fprintf(f, "\t" "FoliageInfo: (not printed yet)\n");
}
@@ -797,7 +797,7 @@ bool CStatCGFCompiler::Process()
sourceWatchFolder = m_CC.m_config->GetAsString("sourceroot", "", "").c_str();
if (sourceWatchFolder.empty())
{
sourceWatchFolder = m_CC.m_config->GetAsString("gameroot", "", "").c_str();
sourceWatchFolder = m_CC.m_config->GetAsString("project-path", "", "").c_str();
}
}