Skip to content

Commit 133738a

Browse files
dpernuitdpernuit
committed
Fixed build errors with UE4.25
1 parent ad2b135 commit 133738a

17 files changed

+82
-80
lines changed

‎Source/HoudiniEngine/Private/HoudiniEngine.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#include "Materials/Material.h"
4747
#include "ISettingsModule.h"
4848
#include "HAL/PlatformFilemanager.h"
49-
#include "Framework/Application/SlateApplication.h"
5049

5150
#if WITH_EDITOR
5251
#include "Widgets/Notifications/SNotificationList.h"

‎Source/HoudiniEngine/Private/HoudiniGeoImporter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ UHoudiniGeoImporter::CreateInstancers(TArray<UHoudiniOutput*>& InOutputs, UObjec
336336
// Transfer all the instancer components to the BP
337337
if (OutputComp.Num() > 0)
338338
{
339-
FKismetEditorUtilities::AddComponentsToBlueprint(Blueprint, OutputComp, false, nullptr, false);
339+
FKismetEditorUtilities::AddComponentsToBlueprint(Blueprint, OutputComp, FKismetEditorUtilities::EAddComponentToBPHarvestMode::None, nullptr, false);
340340
}
341341
}
342342

‎Source/HoudiniEngine/Private/HoudiniMeshTranslator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3318,7 +3318,7 @@ FHoudiniMeshTranslator::CreateStaticMesh_MeshDescription()
33183318

33193319
// TODO
33203320
// Check
3321-
FMeshDescriptionOperations::ConvertSmoothGroupToHardEdges(FaceSmoothingMasks, *MeshDescription);
3321+
FStaticMeshOperations::ConvertSmoothGroupToHardEdges(FaceSmoothingMasks, *MeshDescription);
33223322

33233323
HOUDINI_LOG_MESSAGE(TEXT("CreateStaticMesh_MeshDescription() - FaceSoothing filled in %f seconds."), FPlatformTime::Seconds() - tick);
33243324
tick = FPlatformTime::Seconds();

‎Source/HoudiniEngine/Private/UnrealBrushTranslator.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@ struct HOUDINIENGINE_API FUnrealBrushTranslator
4646
HAPI_NodeId &CreatedNodeId,
4747
const FString& NodeName
4848
);
49+
4950
};

‎Source/HoudiniEngine/Private/UnrealMeshTranslator.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ FUnrealMeshTranslator::HapiCreateInputNodeForStaticMesh(
135135
FHoudiniEngine::Get().GetSession(), PreviousInputOBJNode))
136136
{
137137
HOUDINI_LOG_WARNING(TEXT("Failed to cleanup the previous input OBJ node for %s."), *InputNodeName);
138-
}
138+
}
139139
}
140140

141141
// TODO:
@@ -951,11 +951,11 @@ FUnrealMeshTranslator::CreateInputNodeForRawMesh(
951951
FStaticMeshLODResources& RenderModel = RenderData.LODResources[InLODIndex];
952952
FColorVertexBuffer& ColorVertexBuffer = *ComponentLODInfo.OverrideVertexColors;
953953

954-
if (RenderData.WedgeMap.Num() > 0 && ColorVertexBuffer.GetNumVertices() == RenderModel.GetNumVertices())
954+
if (RenderModel.WedgeMap.Num() > 0 && ColorVertexBuffer.GetNumVertices() == RenderModel.GetNumVertices())
955955
{
956956
// Use the wedge map if it is available as it is lossless.
957957
int32 NumWedges = RawMesh.WedgeIndices.Num();
958-
if (RenderData.WedgeMap.Num() == NumWedges)
958+
if (RenderModel.WedgeMap.Num() == NumWedges)
959959
{
960960
int32 NumExistingColors = RawMesh.WedgeColors.Num();
961961
if (NumExistingColors < NumWedges)
@@ -967,7 +967,7 @@ FUnrealMeshTranslator::CreateInputNodeForRawMesh(
967967
for (int32 i = 0; i < NumWedges; i++)
968968
{
969969
FColor WedgeColor = FColor::White;
970-
int32 Index = RenderData.WedgeMap[i];
970+
int32 Index = RenderModel.WedgeMap[i];
971971
if (Index != INDEX_NONE)
972972
{
973973
WedgeColor = ColorVertexBuffer.VertexColor(Index);
@@ -2397,10 +2397,10 @@ FUnrealMeshTranslator::CreateInputNodeForMeshDescription(
23972397
FStaticMeshLODResources& RenderModel = RenderData.LODResources[InLODIndex];
23982398
FColorVertexBuffer& ColorVertexBuffer = *ComponentLODInfo.OverrideVertexColors;
23992399

2400-
if (RenderData.WedgeMap.Num() > 0 && ColorVertexBuffer.GetNumVertices() == RenderModel.GetNumVertices())
2400+
if (RenderModel.WedgeMap.Num() > 0 && ColorVertexBuffer.GetNumVertices() == RenderModel.GetNumVertices())
24012401
{
24022402
// Use the wedge map if it is available as it is lossless.
2403-
if (RenderData.WedgeMap.Num() == NumVertexInstances)
2403+
if (RenderModel.WedgeMap.Num() == NumVertexInstances)
24042404
{
24052405
bUseComponentOverrideColors = true;
24062406
}
@@ -2663,10 +2663,9 @@ FUnrealMeshTranslator::CreateInputNodeForMeshDescription(
26632663
{
26642664
FStaticMeshComponentLODInfo& ComponentLODInfo = StaticMeshComponent->LODData[InLODIndex];
26652665
FStaticMeshLODResources& RenderModel = StaticMesh->RenderData->LODResources[InLODIndex];
2666-
FStaticMeshRenderData& RenderData = *StaticMesh->RenderData;
26672666
FColorVertexBuffer& ColorVertexBuffer = *ComponentLODInfo.OverrideVertexColors;
26682667

2669-
int32 Index = RenderData.WedgeMap[VertexInstanceIdx];
2668+
int32 Index = RenderModel.WedgeMap[VertexInstanceIdx];
26702669
if (Index != INDEX_NONE)
26712670
{
26722671
Color = ColorVertexBuffer.VertexColor(Index).ReinterpretAsLinear();
@@ -2929,7 +2928,7 @@ FUnrealMeshTranslator::CreateInputNodeForMeshDescription(
29292928
//---------------------------------------------------------------------------------------------------------------------
29302929
TArray<uint32> TriangleSmoothingMasks;
29312930
TriangleSmoothingMasks.SetNumZeroed(NumTriangles);
2932-
FMeshDescriptionOperations::ConvertHardEdgesToSmoothGroup(MeshDescription, TriangleSmoothingMasks);
2931+
FStaticMeshOperations::ConvertHardEdgesToSmoothGroup(MeshDescription, TriangleSmoothingMasks);
29332932
if (TriangleSmoothingMasks.Num() > 0)
29342933
{
29352934
HAPI_AttributeInfo AttributeInfoSmoothingMasks;

‎Source/HoudiniEngineEditor/Private/HoudiniEngineBakeUtils.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ FHoudiniEngineBakeUtils::CloneComponentsAndCreateActor(UHoudiniAssetComponent* H
220220
if (CurrentOutputObject.Value.BakeName.IsEmpty())
221221
CurveName = CurrentOutputObject.Value.BakeName;
222222

223-
FName BaseName(*CurveName);
223+
FName BaseName(CurveName);
224224
USplineComponent* DuplicatedSplineComponent = DuplicateObject<USplineComponent>(SplineComponent, Actor, BaseName);
225225
DuplicatedSplineComponent->AttachToComponent(Actor->GetRootComponent(), FAttachmentTransformRules::KeepRelativeTransform);
226226

@@ -590,7 +590,7 @@ FHoudiniEngineBakeUtils::BakeHoudiniStaticMeshOutputToActors(
590590
// FName NewName = MakeUniqueObjectName(DesiredLevel, Factory->NewActorClass, *PackageParams.ObjectName);
591591
NewActor->Rename(*(PackageParams.ObjectName));
592592
NewActor->SetActorLabel(PackageParams.ObjectName);
593-
NewActor->SetFolderPath(FName(*OwnerActor->GetName()));
593+
NewActor->SetFolderPath(FName(OwnerActor->GetName()));
594594

595595
// Copy properties to new actor
596596
AStaticMeshActor* SMActor = Cast< AStaticMeshActor>(NewActor);
@@ -854,7 +854,7 @@ FHoudiniEngineBakeUtils::ReplaceWithBlueprint(UHoudiniAssetComponent* HoudiniAss
854854

855855
ClonedActor->RemoveFromRoot();
856856
Actor = FKismetEditorUtilities::CreateBlueprintInstanceFromSelection(Blueprint, Actors, Location, Rotator);
857-
Actor->SetFolderPath(FName(*OwnerActor->GetName()));
857+
Actor->SetFolderPath(FName(OwnerActor->GetName()));
858858
}
859859

860860
// Delete Houdini Actor
@@ -1205,7 +1205,7 @@ FHoudiniEngineBakeUtils::BakeHeightfield(
12051205
continue;
12061206

12071207
FLandscapeImportLayerInfo CurrentLayerInfo;
1208-
CurrentLayerInfo.LayerName = FName(*LayerName);
1208+
CurrentLayerInfo.LayerName = FName(LayerName);
12091209
CurrentLayerInfo.LayerInfo = InLandscapeInfo->Layers[n].LayerInfoObj;
12101210
CurrentLayerInfo.LayerData = CurrentLayerIntData;
12111211

@@ -1337,9 +1337,9 @@ FHoudiniEngineBakeUtils::BakeCurve(
13371337
if (!Factory)
13381338
return nullptr;
13391339

1340-
AActor* NewActor = Factory->CreateActor(nullptr, DesiredLevel, InSplineComponent->GetComponentTransform(), RF_Standalone | RF_Public, FName(*PackageParams.ObjectName));
1340+
AActor* NewActor = Factory->CreateActor(nullptr, DesiredLevel, InSplineComponent->GetComponentTransform(), RF_Standalone | RF_Public, FName(PackageParams.ObjectName));
13411341

1342-
USplineComponent* DuplicatedSplineComponent = DuplicateObject<USplineComponent>(InSplineComponent, NewActor, FName(*PackageParams.ObjectName));
1342+
USplineComponent* DuplicatedSplineComponent = DuplicateObject<USplineComponent>(InSplineComponent, NewActor, FName(PackageParams.ObjectName));
13431343
NewActor->AddInstanceComponent(DuplicatedSplineComponent);
13441344
DuplicatedSplineComponent->AttachToComponent(NewActor->GetRootComponent(), FAttachmentTransformRules::KeepRelativeTransform);
13451345

@@ -1351,7 +1351,7 @@ FHoudiniEngineBakeUtils::BakeCurve(
13511351
//FString NewNameStr = NewName.ToString();
13521352
NewActor->Rename(*(PackageParams.ObjectName));
13531353
NewActor->SetActorLabel(PackageParams.ObjectName);
1354-
NewActor->SetFolderPath(FName(*PackageParams.HoudiniAssetName));
1354+
NewActor->SetFolderPath(FName(PackageParams.HoudiniAssetName));
13551355

13561356
return NewActor;
13571357
}
@@ -1424,7 +1424,7 @@ FHoudiniEngineBakeUtils::BakeInputHoudiniCurveToActor(
14241424
//FString NewNameStr = NewName.ToString();
14251425
NewActor->Rename(*PackageParams.ObjectName);
14261426
NewActor->SetActorLabel(PackageParams.ObjectName);
1427-
NewActor->SetFolderPath(FName(*PackageParams.HoudiniAssetName));
1427+
NewActor->SetFolderPath(FName(PackageParams.HoudiniAssetName));
14281428

14291429
return NewActor;
14301430
}
@@ -1707,6 +1707,7 @@ FHoudiniEngineBakeUtils::DuplicateTextureAndCreatePackage(
17071707
return DuplicatedTexture;
17081708
}
17091709

1710+
17101711
void
17111712
FHoudiniEngineBakeUtils::FillInPackageParamsForBakingOutput(
17121713
FHoudiniPackageParams& OutPackageParams,

‎Source/HoudiniEngineRuntime/Private/HoudiniAssetActor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ AHoudiniAssetActor::PostEditChangeProperty(FPropertyChangedEvent & PropertyChang
119119
if (!HoudiniAssetComponent || HoudiniAssetComponent->IsPendingKill())
120120
return;
121121

122-
UProperty* Property = PropertyChangedEvent.MemberProperty;
122+
FProperty* Property = PropertyChangedEvent.MemberProperty;
123123
if (!Property)
124124
return;
125125

‎Source/HoudiniEngineRuntime/Private/HoudiniAssetComponent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ UHoudiniAssetComponent::PostEditChangeProperty(FPropertyChangedEvent & PropertyC
936936
{
937937
Super::PostEditChangeProperty(PropertyChangedEvent);
938938

939-
UProperty * Property = PropertyChangedEvent.MemberProperty;
939+
FProperty * Property = PropertyChangedEvent.MemberProperty;
940940
if (!Property)
941941
return;
942942

‎Source/HoudiniEngineRuntime/Private/HoudiniAssetComponent.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,8 @@ class HOUDINIENGINERUNTIME_API UHoudiniAssetComponent : public UPrimitiveCompone
402402
Category = HoudiniGeneratedStaticMeshSettings,
403403
meta = (DisplayName = "Double Sided Geometry"))
404404
uint32 bGeneratedDoubleSidedGeometry : 1;
405+
406+
// Physical material to use for simple collision on this body. Encodes information about density, friction etc.
405407
UPROPERTY(EditAnywhere,
406408
Category = HoudiniGeneratedStaticMeshSettings,
407409
meta = (DisplayName = "Simple Collision Physical Material"))

‎Source/HoudiniEngineRuntime/Private/HoudiniEngineRuntimeUtils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ FHoudiniEngineRuntimeUtils::GetBoundingBoxesFromActors(const TArray<AActor*> InA
5757
if (!CurrentActor || CurrentActor->IsPendingKill())
5858
continue;
5959

60-
OutBBoxes.Add(CurrentActor->GetComponentsBoundingBox(true));
60+
OutBBoxes.Add(CurrentActor->GetComponentsBoundingBox(true, true));
6161
}
6262
}
6363

0 commit comments

Comments
 (0)