GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Refactor AssetsContainer

Browse Source
This commit is contained in:
Wojtek Figat
2021-02-26 15:40:44 +01:00
parent e1497bcfe2
commit 327fa6718e
9 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Layer.cpp
View File

@@ -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;
}

2
Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
View File

@@ -6,7 +6,7 @@
#include "Engine/Graphics/Materials/MaterialInfo.h"
#include "Engine/Graphics/Materials/MaterialParams.h"
#include "Engine/Content/Utilities/AssetsContainer.h"
#include "Engine/Content/AssetsContainer.h"
#include "MaterialLayer.h"
#include "Types.h"