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

Fix crash when model or skinned model loading fails

Browse Source
This commit is contained in:
Wojciech Figat
2021-11-24 17:42:01 +01:00
parent 7d970de5ce
commit af305dc376
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Content/Assets/Model.cpp
View File

@@ -125,8 +125,6 @@ Model::Model(const SpawnParams& params, const AssetInfo* info)
Model::~Model() Model::~Model()
{ {
// Ensure to be fully disposed
ASSERT(IsInitialized() == false);
ASSERT(_streamingTask == nullptr); ASSERT(_streamingTask == nullptr);
} }

2
Source/Engine/Content/Assets/SkinnedModel.cpp
View File

@@ -118,8 +118,6 @@ SkinnedModel::SkinnedModel(const SpawnParams& params, const AssetInfo* info)
SkinnedModel::~SkinnedModel() SkinnedModel::~SkinnedModel()
{ {
// Ensure to be fully disposed
ASSERT(IsInitialized() == false);
ASSERT(_streamingTask == nullptr); ASSERT(_streamingTask == nullptr);
} }

4
Source/Engine/Graphics/Models/Mesh.h
View File

@@ -24,8 +24,8 @@ DECLARE_SCRIPTING_TYPE_WITH_CONSTRUCTOR_IMPL(Mesh, MeshBase);
protected: protected:
bool _hasLightmapUVs; bool _hasLightmapUVs;
GPUBuffer* _vertexBuffers[3]; GPUBuffer* _vertexBuffers[3] = {};
GPUBuffer* _indexBuffer; GPUBuffer* _indexBuffer = nullptr;
#if USE_PRECISE_MESH_INTERSECTS #if USE_PRECISE_MESH_INTERSECTS
CollisionProxy _collisionProxy; CollisionProxy _collisionProxy;
#endif #endif

4
Source/Engine/Graphics/Models/SkinnedMesh.h
View File

@@ -19,8 +19,8 @@ API_CLASS(NoSpawn) class FLAXENGINE_API SkinnedMesh : public MeshBase
DECLARE_SCRIPTING_TYPE_WITH_CONSTRUCTOR_IMPL(SkinnedMesh, MeshBase); DECLARE_SCRIPTING_TYPE_WITH_CONSTRUCTOR_IMPL(SkinnedMesh, MeshBase);
protected: protected:
GPUBuffer* _vertexBuffer; GPUBuffer* _vertexBuffer = nullptr;
GPUBuffer* _indexBuffer; GPUBuffer* _indexBuffer = nullptr;
mutable Array<byte> _cachedIndexBuffer; mutable Array<byte> _cachedIndexBuffer;
mutable Array<byte> _cachedVertexBuffer; mutable Array<byte> _cachedVertexBuffer;
mutable int32 _cachedIndexBufferCount; mutable int32 _cachedIndexBufferCount;