Commit 59d6057c authored by Byurrrer's avatar Byurrrer

поправил баг: статическая геометрия не полностью очищалась при очистке уровня

parent c12e17e0
......@@ -1340,9 +1340,10 @@ void CModels::deleteModel(ID idModel)
void CModels::clear()
{
for (int i = 0; i < m_aModels.size(); ++i)
while(m_aModels.size() > 0)
{
deleteModel((m_aModels.size() - 1) - i);
// , erase id ( - 1)
deleteModel((m_aModels.size() - 1));
}
}
......
......@@ -303,15 +303,15 @@ void level_editor::GeomTransformByHelper()
float3 vCurrScale = *SGeom_ModelGetScale(level_editor::idActiveElement);
float3 vNewScale;
if (isStartScale)
if (level_editor::isStartScale)
{
isStartScale = false;
vStartScale = vCurrScale;
level_editor::isStartScale = false;
level_editor::vStartScale = vCurrScale;
vNewScale = vCurrScale;
}
else
{
vNewScale = vStartScale + (level_editor::pAxesHelper->getScale() - float3(1, 1, 1));
vNewScale = level_editor::vStartScale + (level_editor::pAxesHelper->getScale() - float3(1, 1, 1));
}
//float3 vNewScale = vCurrScale + (level_editor::pAxesHelper->getScale() - float3(1, 1, 1));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment