Material: Fixed cleanup of materials waiting to be initialised.

DragonJoker · Apr 5, 2024 · e61c95d · e61c95d
1 parent 435abca
commit e61c95d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/source/Core/Castor3D/Material/Material.cpp b/source/Core/Castor3D/Material/Material.cpp
@@ -143,11 +143,6 @@ namespace castor3d
 
 	void Material::cleanup()
 	{
-		if ( !m_initialised )
-		{
-			return;
-		}
-
 		m_initialised = false;
 
 		for ( auto const & pass : m_passes )

diff --git a/source/Core/Castor3D/Material/Pass/Pass.cpp b/source/Core/Castor3D/Material/Pass/Pass.cpp
@@ -295,11 +295,8 @@ namespace castor3d
 
 	void Pass::cleanup()
 	{
-		if ( m_initialised )
-		{
-			m_initialised = false;
-			getOwner()->getOwner()->getMaterialCache().unregisterPass( *this );
-		}
+		m_initialised = false;
+		getOwner()->getOwner()->getMaterialCache().unregisterPass( *this );
 	}
 
 	void Pass::update()