From 0ea37879e8e2bc59b9560a9a81c41d61922072ff Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 7 Apr 2025 19:28:59 +0200
Subject: [PATCH] Add wait on asset load when accessing material parameter
 values directly

---
 Source/Engine/Content/Assets/MaterialBase.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/Engine/Content/Assets/MaterialBase.cpp b/Source/Engine/Content/Assets/MaterialBase.cpp
index 10eba03c5..6ef5f9429 100644
--- a/Source/Engine/Content/Assets/MaterialBase.cpp
+++ b/Source/Engine/Content/Assets/MaterialBase.cpp
@@ -16,6 +16,8 @@ MaterialBase::MaterialBase(const SpawnParams& params, const AssetInfo* info)
 
 Variant MaterialBase::GetParameterValue(const StringView& name)
 {
+    if (!IsLoaded() && WaitForLoaded())
+        return Variant::Null;
     const auto param = Params.Get(name);
     if (param)
     {
@@ -27,6 +29,8 @@ Variant MaterialBase::GetParameterValue(const StringView& name)
 
 void MaterialBase::SetParameterValue(const StringView& name, const Variant& value, bool warnIfMissing)
 {
+    if (!IsLoaded() && WaitForLoaded())
+        return;
     const auto param = Params.Get(name);
     if (param)
     {