Skip to content

Commit 30658e3

Browse files
committed
Reverted aggressive cancellation propagation
1 parent 7d22130 commit 30658e3

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-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.68",
4+
"VersionName": "0.67.10",
55
"FriendlyName": "PCGExtendedToolkit",
66
"Description": "A rather large toolset that expand on existing PCG capabilities in unique ways.",
77
"Category": "PCG",

Source/PCGExtendedToolkit/Private/PCGExContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ bool FPCGExContext::CancelExecution(const FString& InReason)
492492
bExecutionCancelled = true;
493493

494494
OutputData.Reset();
495-
OutputData.bCancelExecution = true;
495+
if (bPropagateAbortedExecution){ OutputData.bCancelExecution = true; }
496496

497497
WorkPermit.Reset();
498498
ResumeExecution();

Source/PCGExtendedToolkit/Private/PCGExPointsProcessor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ void FPCGExPointsProcessorElement::OnContextInitialized(FPCGExPointsProcessorCon
306306

307307
InContext->bFlattenOutput = Settings->bFlattenOutput;
308308
InContext->bScopedAttributeGet = Settings->WantsScopedAttributeGet();
309+
InContext->bPropagateAbortedExecution = Settings->bPropagateAbortedExecution;
309310
}
310311

311312
bool FPCGExPointsProcessorElement::Boot(FPCGExContext* InContext) const

Source/PCGExtendedToolkit/Public/PCGExContext.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ struct PCGEXTENDEDTOOLKIT_API FPCGExContext : FPCGContext
4646
TSharedPtr<PCGEx::FManagedObjects> ManagedObjects;
4747

4848
bool bScopedAttributeGet = false;
49+
bool bPropagateAbortedExecution = false;
4950

5051
FPCGExContext();
5152

Source/PCGExtendedToolkit/Public/PCGExPointsProcessor.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,18 @@ class PCGEXTENDEDTOOLKIT_API UPCGExPointsProcessorSettings : public UPCGSettings
109109
UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Cleanup", meta=(PCG_NotOverridable, DisplayName="Protected Attributes", EditCondition="bCleanupConsumableAttributes"))
110110
TArray<FName> ProtectedAttributes;
111111

112+
/** Whether the execution of the graph should be cancelled if this node execution is cancelled internally */
113+
UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Warnings and Errors", meta=(PCG_NotOverridable, AdvancedDisplay))
114+
bool bPropagateAbortedExecution = false;
115+
112116
/** */
113117
UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Warnings and Errors", meta=(PCG_NotOverridable, AdvancedDisplay))
114118
bool bQuietMissingInputError = false;
115119

116120
/** */
117121
UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Warnings and Errors", meta=(PCG_NotOverridable, AdvancedDisplay))
118122
bool bQuietCancellationError = false;
119-
123+
120124
//~End UPCGExPointsProcessorSettings
121125

122126
#if WITH_EDITOR

0 commit comments

Comments
 (0)