Merge remote-tracking branch 'origin/master' into 1.7

2023-09-19 21:42:53 +02:00
parent f0b5d3b838 49a6b5734a
commit a71de7357c
49 changed files with 1684 additions and 1336 deletions
--- a/Source/Engine/Content/Assets/MaterialInstance.cpp
+++ b/Source/Engine/Content/Assets/MaterialInstance.cpp
@@ -205,8 +205,6 @@ void MaterialInstance::Bind(BindParameters& params)

 Asset::LoadResult MaterialInstance::load()
 {
-    ASSERT(_baseMaterial == nullptr);
-
    // Get main chunk
    auto chunk0 = GetChunk(0);
    if (chunk0 == nullptr || chunk0->IsMissing())
@@ -229,6 +227,7 @@ Asset::LoadResult MaterialInstance::load()
    else
    {
        // Clear parameters if has no material loaded
+        _baseMaterial = nullptr;
        Params.Dispose();
        ParamsChanged();
    }