Skip to content

Commit 7f2f5cd

Browse files
committed
More aggressive empty input warning/error suppression
1 parent e073415 commit 7f2f5cd

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

PCGExtendedToolkit.uplugin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"FileVersion": 3,
33
"Version": 1,
4-
"VersionName": "0.67.8",
4+
"VersionName": "0.67.9",
55
"FriendlyName": "PCGExtendedToolkit",
66
"Description": "A rather large toolset that expand on existing PCG capabilities in unique ways.",
77
"Category": "PCG",

Source/PCGExtendedToolkit/Private/PCGExPointsProcessor.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ bool FPCGExPointsProcessorElement::PrepareDataInternal(FPCGContext* InContext) c
230230
{
231231
if (!Boot(Context))
232232
{
233-
Context->OutputData.TaggedData.Empty(); // Ensure culling of subsequent nodes if boot fails
234233
return Context->CancelExecution(TEXT(""));
235234
}
236235

@@ -311,6 +310,8 @@ void FPCGExPointsProcessorElement::OnContextInitialized(FPCGExPointsProcessorCon
311310

312311
bool FPCGExPointsProcessorElement::Boot(FPCGExContext* InContext) const
313312
{
313+
if (InContext->InputData.bCancelExecution) { return false; }
314+
314315
FPCGExPointsProcessorContext* Context = static_cast<FPCGExPointsProcessorContext*>(InContext);
315316
PCGEX_SETTINGS(PointsProcessor)
316317

@@ -336,9 +337,11 @@ bool FPCGExPointsProcessorElement::Boot(FPCGExContext* InContext) const
336337
Context->MainPoints = MakeShared<PCGExData::FPointIOCollection>(Context, Settings->GetIsMainTransactional());
337338
Context->MainPoints->OutputPin = Settings->GetMainOutputPin();
338339

340+
TArray<FPCGTaggedData> Sources = Context->InputData.GetInputsByPin(Settings->GetMainInputPin());
341+
if (Sources.IsEmpty() && !Settings->IsInputless()) { return false; } // Silent cancel, there's simply no data
342+
339343
if (Settings->GetMainAcceptMultipleData())
340344
{
341-
TArray<FPCGTaggedData> Sources = Context->InputData.GetInputsByPin(Settings->GetMainInputPin());
342345
Context->MainPoints->Initialize(Sources, Settings->GetMainOutputInitMode());
343346
}
344347
else

0 commit comments

Comments
 (0)