diff --git a/Content/Tangibles/tangiblecharacter.uasset b/Content/Tangibles/tangiblecharacter.uasset index 07723ee7..a483da5e 100644 --- a/Content/Tangibles/tangiblecharacter.uasset +++ b/Content/Tangibles/tangiblecharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44f7aec8868369b7bae646af276bc8ef2f200462d00f80d3346268108ac34d4f -size 377693 +oid sha256:87e7eeaef41ab4b963325a54691493c65b17a1690b7c2d2e27e36cac4fde062b +size 377351 diff --git a/Source/Integration/FormatError.cpp b/Source/Integration/FormatError.cpp index 3e84feb5..cc23791e 100644 --- a/Source/Integration/FormatError.cpp +++ b/Source/Integration/FormatError.cpp @@ -104,8 +104,8 @@ void UK2Node_FormatError::CreateCorrectPins() } if (FindPin(FormatPinName, EGPD_Input) == nullptr) { - UEdGraphPin *P = CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_Text, FormatPinName); - P->DefaultTextValue = LOCTEXT("FormatErrorMessage_DefaultMessage", "Error Message"); + UEdGraphPin *P = CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_String, FormatPinName); + P->DefaultValue = TEXT("Error Message"); } if (FindPin(VerbosityPinName, EGPD_Input) == nullptr) { @@ -252,7 +252,7 @@ void UK2Node_FormatError::PinDefaultValueChanged(UEdGraphPin* Pin) if(IsFormatPin(Pin)) { PinNames.Empty(); - FText::GetFormatPatternParameters(Pin->DefaultTextValue, PinNames); + FText::GetFormatPatternParameters(FText::FromString(Pin->DefaultValue), PinNames); CreateCorrectPins(); GetGraph()->NotifyNodeChanged(this); } @@ -608,11 +608,12 @@ FText UK2Node_FormatError::GetMenuCategory() const return FEditorCategoryUtils::GetCommonCategory(FCommonEditorCategory::Text); } -void UlxFormatErrorLibrary::FormatErrorInternal(UObject *Context, ElxLogVerbosity Verbosity, ElxDisplayDuration DisplayDuration, FText InPattern, TArray InArgs) +void UlxFormatErrorLibrary::FormatErrorInternal(UObject *Context, ElxLogVerbosity Verbosity, ElxDisplayDuration DisplayDuration, const FString &InPattern, TArray InArgs) { // Generate the formatted string. // - FText Message = FTextFormatter::Format(MoveTemp(InPattern), MoveTemp(InArgs), false, false); + FText InPatternText(FText::FromString(InPattern)); + FText Message = FTextFormatter::Format(MoveTemp(InPatternText), MoveTemp(InArgs), false, false); FString MessageString = Message.ToString(); // Convert the DisplayDuration enum into a number of seconds. diff --git a/Source/Integration/FormatError.h b/Source/Integration/FormatError.h index e6bed024..ea96cf6b 100644 --- a/Source/Integration/FormatError.h +++ b/Source/Integration/FormatError.h @@ -134,7 +134,7 @@ class UlxFormatErrorLibrary : public UBlueprintFunctionLibrary public: UFUNCTION(BlueprintCallable, meta=(WorldContext = "Context", BlueprintInternalUseOnly = "true")) - static void FormatErrorInternal(UObject *Context, ElxLogVerbosity Verbosity, ElxDisplayDuration DisplayDuration, FText InPattern, TArray InArgs); + static void FormatErrorInternal(UObject *Context, ElxLogVerbosity Verbosity, ElxDisplayDuration DisplayDuration, const FString &InPattern, TArray InArgs); };