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

# Conflicts: # Source/Engine/Platform/Windows/WindowsPlatform.h
2026-04-08 13:24:29 +02:00
parent bc30d67c3f 6a8d6af17e
commit 963b2f327f
15 changed files with 186 additions and 80 deletions
@@ -220,7 +220,11 @@ void PostFxMaterialsSettings::BlendWith(PostFxMaterialsSettings& other, float we
        while (Materials.Count() != POST_PROCESS_SETTINGS_MAX_MATERIALS && indexSrc < other.Materials.Count())
        {
            if (!Materials.Contains(materialsSrc[indexSrc].GetID()))
-                Materials.Add(materialsSrc[indexSrc]);
+            {
+                auto& ref = materialsSrc[indexSrc];
+                ref.Get(); // Load asset
+                Materials.Add(ref);
+            }
            indexSrc++;
        }
    }