Integrating github/staging through commit ab87ed9
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user