Tweaks

2021-07-05 21:52:34 +02:00
parent 44c4ab6580
commit 2585c02b68
3 changed files with 17 additions and 12 deletions
--- a/Source/Engine/Content/Assets/MaterialInstance.cpp
+++ b/Source/Engine/Content/Assets/MaterialInstance.cpp
@@ -115,16 +115,6 @@ void MaterialInstance::OnBaseParamsChanged()
    ParamsChanged();
 }

-void MaterialInstance::OnUnload()
-{
-    if (_baseMaterial)
-    {
-        OnBaseUnset();
-        _baseMaterial = nullptr;
-    }
-    Params.Dispose();
-}
-
 bool MaterialInstance::IsMaterialInstance() const
 {
    return true;
@@ -242,7 +232,12 @@ Asset::LoadResult MaterialInstance::load()

 void MaterialInstance::unload(bool isReloading)
 {
-    OnUnload();
+    if (_baseMaterial)
+    {
+        OnBaseUnset();
+        _baseMaterial = nullptr;
+    }
+    Params.Dispose();
 }

 AssetChunksFlag MaterialInstance::getChunksToPreload() const