Refactor AssetsContainer

2021-02-26 15:40:44 +01:00
parent e1497bcfe2
commit 327fa6718e
9 changed files with 11 additions and 15 deletions
--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
@@ -271,7 +271,7 @@ void MaterialGenerator::prepareLayer(MaterialLayer* layer, bool allowVisiblePara
                mp.Type = MaterialParameterType::Texture;

                // Special case for Normal Maps
-                auto asset = Content::LoadAsync<Texture>((Guid)param->Value);
+                auto asset = (Texture*)::LoadAsset((Guid)param->Value, Texture::TypeInitializer);
                if (asset && !asset->WaitForLoaded() && asset->IsNormalMap())
                    mp.Type = MaterialParameterType::NormalMap;
            }