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

Minor tweaks

Browse Source
This commit is contained in:
Wojtek Figat
2024-04-11 16:19:35 +02:00
parent 4e65b76b8c
commit 803249f126
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Level/Actors/StaticModel.cpp
View File

@@ -400,13 +400,13 @@ void StaticModel::Draw(RenderContextBatch& renderContextBatch)
bool StaticModel::IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) bool StaticModel::IntersectsItself(const Ray& ray, Real& distance, Vector3& normal)
{ {
bool result = false; bool result = false;
if (Model != nullptr && Model->IsLoaded()) if (Model != nullptr && Model->IsLoaded())
{ {
Mesh* mesh; Mesh* mesh;
result = Model->Intersects(ray, _transform, distance, normal, &mesh); Matrix world;
GetLocalToWorldMatrix(world);
result = Model->Intersects(ray, world, distance, normal, &mesh);
} }
return result; return result;
} }

3
Source/Engine/Utilities/RectPack.h
View File

@@ -142,7 +142,8 @@ struct RectPack
template<class... Args> template<class... Args>
void Free(Args&&...args) void Free(Args&&...args)
{ {
ASSERT(IsUsed); if (!IsUsed)
return;
IsUsed = false; IsUsed = false;
((NodeType*)this)->OnFree(Forward<Args>(args)...); ((NodeType*)this)->OnFree(Forward<Args>(args)...);
} }