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

Merge remote-tracking branch 'origin/master' into 1.10

Browse Source 
# Conflicts:
#	Source/Editor/SceneGraph/Actors/StaticModelNode.cs
#	Source/Engine/Graphics/Models/Mesh.cs
#	Source/Engine/Graphics/Models/ModelData.h
This commit is contained in:
Wojtek Figat
2025-03-13 11:23:01 +01:00
parent 2cf30c27eb 5d32bb962f
commit 5d3da8a8d0
34 changed files with 834 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Graphics/Models/ModelData.h
View File

@@ -91,7 +91,7 @@ public:
int32 LightmapUVsIndex = -1;
/// <summary>
/// Global translation for this mesh to be at its local origin.
/// Local translation for this mesh to be at it's local origin.
/// </summary>
Vector3 OriginTranslation = Vector3::Zero;