Skip to content

Commit 768e9b7

Browse files
committed
Nothing special, cumulative update for coding style fixes etc.
1 parent 3b9fbf0 commit 768e9b7

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ UmodelExport/
1919
UmodelSaved/
2020
Screenshots/
2121
notify.log
22+
umodel.cfg
2223

2324
# Executable files and pdb
2425
umodel.pdb

MeshInstance/SkelMeshInstance.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct CMeshBoneData
2929
{
3030
// static data (computed after mesh loading)
3131
int BoneMap; // index of bone in animation tracks
32-
CCoords RefCoords; // coordinates of bone in reference pose (unused!!)
32+
CCoords RefCoords; // coordinates of bone in reference pose (used only when computing RefCoordsInv)
3333
CCoords RefCoordsInv; // inverse of RefCoords
3434
int SubtreeSize; // count of all children bones (0 for leaf bone)
3535
// dynamic data

Unreal/UnMesh4.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,8 @@ struct FStaticLODModel4
11411141
guard(FStaticLODModel4::SerializeRenderItem);
11421142

11431143
FStripDataFlags StripFlags(Ar);
1144-
// FSkeletalMeshCustomVersion::Type SkelMeshVer = FSkeletalMeshCustomVersion::Get(Ar);
1144+
1145+
//TODO: check 'MinLodStripFlag' (UE4.20)
11451146

11461147
Lod.Sections.Serialize2<FSkelMeshSection4::SerializeRenderItem>(Ar);
11471148
#if DEBUG_SKELMESH
@@ -2098,22 +2099,22 @@ void UStaticMesh4::ConvertMesh()
20982099

20992100
struct FRawMesh
21002101
{
2101-
TArray<int> FaceMaterialIndices;
2102-
TArray<int> FaceSmoothingMask;
2102+
TArray<int32> FaceMaterialIndices;
2103+
TArray<uint32> FaceSmoothingMask;
21032104
TArray<FVector> VertexPositions;
2104-
TArray<int> WedgeIndices;
2105+
TArray<int32> WedgeIndices;
21052106
TArray<FVector> WedgeTangent;
21062107
TArray<FVector> WedgeBinormal;
21072108
TArray<FVector> WedgeNormal;
21082109
TArray<FVector2D> WedgeTexCoords[MAX_STATIC_UV_SETS_UE4];
21092110
TArray<FColor> WedgeColors;
2110-
TArray<int> MaterialIndexToImportIndex;
2111+
TArray<int32> MaterialIndexToImportIndex;
21112112

21122113
void Serialize(FArchive& Ar)
21132114
{
21142115
guard(FRawMesh::Serialize);
21152116

2116-
int Version, LicenseeVersion;
2117+
int32 Version, LicenseeVersion;
21172118
Ar << Version << LicenseeVersion;
21182119

21192120
Ar << FaceMaterialIndices;

Viewers/MaterialViewer.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -693,12 +693,10 @@ static void OutlineMaterial(UObject *Obj, int indent)
693693

694694
Outline(S_RED "%s'%s'", Obj->GetClassName(), Obj->Name);
695695

696-
bool processed = false;
697696
#define MAT_BEGIN(ClassName) \
698697
if (Obj->IsA(#ClassName+1)) \
699698
{ \
700699
guard(ClassName); \
701-
processed = true; \
702700
ClassName *Mat = static_cast<ClassName*>(Obj);
703701

704702
#define MAT_END \
@@ -799,10 +797,6 @@ static void OutlineMaterial(UObject *Obj, int indent)
799797
MAT_END
800798
#endif // UNREAL3
801799

802-
if (!processed)
803-
{
804-
//!! unknown material
805-
}
806800
FlushProps();
807801
textIndent = oldIndent;
808802

t.bat

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
@echo off
2+
cd %~dp0
23
bash test.sh %*

0 commit comments

Comments
 (0)