Compare commits

..

No commits in common. "63b3ec08191b5df08c7fc35a3f3d424513938308" and "b7f7c52e581680550124a34afbdefac4fa9df32b" have entirely different histories.

15 changed files with 15 additions and 41 deletions

View File

@ -87,7 +87,7 @@ r.RayTracing.UseTextureLod=False
r.PathTracing=True r.PathTracing=True
r.GenerateMeshDistanceFields=True r.GenerateMeshDistanceFields=True
r.DistanceFields.DefaultVoxelDensity=0.200000 r.DistanceFields.DefaultVoxelDensity=0.200000
r.Nanite.ProjectEnabled=true r.Nanite.ProjectEnabled=False
r.AllowStaticLighting=True r.AllowStaticLighting=True
r.NormalMapsForStaticLighting=True r.NormalMapsForStaticLighting=True
r.ForwardShading=False r.ForwardShading=False
@ -180,9 +180,7 @@ bStreamSkeletalMeshLODs=(Default=False,PerPlatform=())
bDiscardSkeletalMeshOptionalLODs=(Default=False,PerPlatform=()) bDiscardSkeletalMeshOptionalLODs=(Default=False,PerPlatform=())
VisualizeCalibrationColorMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationColor.PPM_DefaultCalibrationColor VisualizeCalibrationColorMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationColor.PPM_DefaultCalibrationColor
VisualizeCalibrationCustomMaterialPath=None VisualizeCalibrationCustomMaterialPath=None
VisualizeCalibrationGrayscaleMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationGrayscale.PPM_DefaultCalibrationGrayscaler VisualizeCalibrationGrayscaleMaterialPath=/Engine/EngineMaterials/PPM_DefaultCalibrationGrayscale.PPM_DefaultCalibrationGrayscale
r.Nanite.AllowTessellation=1
r.Nanite.Tessellation=1
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings] [/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -35,10 +35,7 @@ void ALevelEndTriggerVolume::OnOverlapBegin(UPrimitiveComponent* OverlappedCompo
{ {
GetCollisionComponent()->OnComponentBeginOverlap.Clear(); GetCollisionComponent()->OnComponentBeginOverlap.Clear();
if (!NextLevel.IsNull()) gameInstance->GetCurrentLevelManager()->LoadNextLevel(NextLevel);
{
UGameplayStatics::OpenLevelBySoftObjectPtr(GetWorld(), NextLevel);
}
this->Destroy(); this->Destroy();
} }