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
@@ -1881,7 +1881,6 @@ CMaterial* CEntityObject::GetRenderMaterial() const
//////////////////////////////////////////////////////////////////////////
void CEntityObject::SetHelperScale(float scale)
{
bool bChanged = m_helperScale != scale;
m_helperScale = scale;
}
@@ -2034,8 +2033,6 @@ void CEntityObject::ApplyOptics(const QString& opticsFullName, IOpticsElementBas
//////////////////////////////////////////////////////////////////////////
void CEntityObject::SetOpticsName(const QString& opticsFullName)
{
bool bUpdateOpticsProperty = true;
if (opticsFullName.isEmpty())
{
CDLight* pLight = GetLightProperty();