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

Use SoftObjectReference for deformable asset ref to prevent removing it by Content GC

Browse Source
This commit is contained in:
Wojtek Figat
2022-02-28 23:16:00 +01:00
parent 4a9c746bed
commit 3a1475fa9c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Graphics/GPUDevice.cpp
View File

@@ -11,6 +11,7 @@
#include "Engine/Content/Assets/Shader.h" #include "Engine/Content/Assets/Shader.h"
#include "Engine/Content/Assets/Material.h" #include "Engine/Content/Assets/Material.h"
#include "Engine/Content/Content.h" #include "Engine/Content/Content.h"
#include "Engine/Content/SoftAssetReference.h"
#include "Engine/Platform/Windows/WindowsWindow.h" #include "Engine/Platform/Windows/WindowsWindow.h"
#include "Engine/Render2D/Render2D.h" #include "Engine/Render2D/Render2D.h"
#include "Engine/Engine/CommandLine.h" #include "Engine/Engine/CommandLine.h"
@@ -19,7 +20,6 @@
#include "Engine/Profiler/Profiler.h" #include "Engine/Profiler/Profiler.h"
#include "Engine/Renderer/RenderList.h" #include "Engine/Renderer/RenderList.h"
#include "Engine/Core/Utilities.h" #include "Engine/Core/Utilities.h"
#include "Engine/Scripting/SoftObjectReference.h"
GPUPipelineState* GPUPipelineState::Spawn(const SpawnParams& params) GPUPipelineState* GPUPipelineState::Spawn(const SpawnParams& params)
{ {
@@ -253,7 +253,7 @@ struct GPUDevice::PrivateData
GPUPipelineState* PS_Clear = nullptr; GPUPipelineState* PS_Clear = nullptr;
GPUBuffer* FullscreenTriangleVB = nullptr; GPUBuffer* FullscreenTriangleVB = nullptr;
AssetReference<Material> DefaultMaterial; AssetReference<Material> DefaultMaterial;
SoftObjectReference<Material> DefaultDeformableMaterial; SoftAssetReference<Material> DefaultDeformableMaterial;
AssetReference<Texture> DefaultNormalMap; AssetReference<Texture> DefaultNormalMap;
AssetReference<Texture> DefaultWhiteTexture; AssetReference<Texture> DefaultWhiteTexture;
AssetReference<Texture> DefaultBlackTexture; AssetReference<Texture> DefaultBlackTexture;