Skip to content

Commit af300a9

Browse files
MothDoctorMothDoctor
committed
UE 5.5 compilation fixes
1 parent 11866ae commit af300a9

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

‎Source/Flow/Private/Types/FlowDataPinBlueprintLibrary.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2151,7 +2151,7 @@ FSoftClassPath UFlowDataPinBlueprintLibrary::GetClassValue(const FFlowDataPinVal
21512151
return ClassDataPinValue.Values[Index];
21522152
}
21532153
UE_LOG(LogFlow, Error, TEXT("Insufficient values in Class Data Pin Value."));
2154-
return nullptr;
2154+
return FSoftClassPath();
21552155
}
21562156

21572157
TArray<FSoftClassPath> UFlowDataPinBlueprintLibrary::GetClassValues(FFlowDataPinValue_Class& ClassDataPinValue)

‎Source/Flow/Public/Types/FlowDataPinValuesStandard.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
//======================================================================
2020
// Bool
2121
//======================================================================
22-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Bool - Flow DataPin Value", meta = (FlowPinType = "Bool", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructBool"))
22+
USTRUCT(BlueprintType, DisplayName = "Bool - Flow DataPin Value", meta = (FlowPinType = "Bool", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructBool"))
2323
struct FFlowDataPinValue_Bool : public FFlowDataPinValue
2424
{
2525
GENERATED_BODY()
@@ -42,7 +42,7 @@ struct FFlowDataPinValue_Bool : public FFlowDataPinValue
4242
//======================================================================
4343
// Int (int32)
4444
//======================================================================
45-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Int - Flow DataPin Value", meta = (FlowPinType = "Int", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructInt"))
45+
USTRUCT(BlueprintType, DisplayName = "Int - Flow DataPin Value", meta = (FlowPinType = "Int", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructInt"))
4646
struct FFlowDataPinValue_Int : public FFlowDataPinValue
4747
{
4848
GENERATED_BODY()
@@ -65,7 +65,7 @@ struct FFlowDataPinValue_Int : public FFlowDataPinValue
6565
//======================================================================
6666
// Int64
6767
//======================================================================
68-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Int64 - Flow DataPin Value", meta = (FlowPinType = "Int64", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructInt64"))
68+
USTRUCT(BlueprintType, DisplayName = "Int64 - Flow DataPin Value", meta = (FlowPinType = "Int64", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructInt64"))
6969
struct FFlowDataPinValue_Int64 : public FFlowDataPinValue
7070
{
7171
GENERATED_BODY()
@@ -88,7 +88,7 @@ struct FFlowDataPinValue_Int64 : public FFlowDataPinValue
8888
//======================================================================
8989
// Float
9090
//======================================================================
91-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Float - Flow DataPin Value", meta = (FlowPinType = "Float", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructFloat"))
91+
USTRUCT(BlueprintType, DisplayName = "Float - Flow DataPin Value", meta = (FlowPinType = "Float", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructFloat"))
9292
struct FFlowDataPinValue_Float : public FFlowDataPinValue
9393
{
9494
GENERATED_BODY()
@@ -111,7 +111,7 @@ struct FFlowDataPinValue_Float : public FFlowDataPinValue
111111
//======================================================================
112112
// Double
113113
//======================================================================
114-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Double - Flow DataPin Value", meta = (FlowPinType = "Double", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructDouble"))
114+
USTRUCT(BlueprintType, DisplayName = "Double - Flow DataPin Value", meta = (FlowPinType = "Double", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructDouble"))
115115
struct FFlowDataPinValue_Double : public FFlowDataPinValue
116116
{
117117
GENERATED_BODY()
@@ -134,7 +134,7 @@ struct FFlowDataPinValue_Double : public FFlowDataPinValue
134134
//======================================================================
135135
// Name
136136
//======================================================================
137-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Name - Flow DataPin Value", meta = (FlowPinType = "Name", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructName"))
137+
USTRUCT(BlueprintType, DisplayName = "Name - Flow DataPin Value", meta = (FlowPinType = "Name", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructName"))
138138
struct FFlowDataPinValue_Name : public FFlowDataPinValue
139139
{
140140
GENERATED_BODY()
@@ -157,7 +157,7 @@ struct FFlowDataPinValue_Name : public FFlowDataPinValue
157157
//======================================================================
158158
// String
159159
//======================================================================
160-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "String - Flow DataPin Value", meta = (FlowPinType = "String", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructString"))
160+
USTRUCT(BlueprintType, DisplayName = "String - Flow DataPin Value", meta = (FlowPinType = "String", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructString"))
161161
struct FFlowDataPinValue_String : public FFlowDataPinValue
162162
{
163163
GENERATED_BODY()
@@ -180,7 +180,7 @@ struct FFlowDataPinValue_String : public FFlowDataPinValue
180180
//======================================================================
181181
// Text
182182
//======================================================================
183-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Text - Flow DataPin Value", meta = (FlowPinType = "Text", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructText"))
183+
USTRUCT(BlueprintType, DisplayName = "Text - Flow DataPin Value", meta = (FlowPinType = "Text", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructText"))
184184
struct FFlowDataPinValue_Text : public FFlowDataPinValue
185185
{
186186
GENERATED_BODY()
@@ -203,7 +203,7 @@ struct FFlowDataPinValue_Text : public FFlowDataPinValue
203203
//======================================================================
204204
// Enum
205205
//======================================================================
206-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Enum - Flow DataPin Value", meta = (FlowPinType = "Enum", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructEnum"))
206+
USTRUCT(BlueprintType, DisplayName = "Enum - Flow DataPin Value", meta = (FlowPinType = "Enum", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructEnum"))
207207
struct FFlowDataPinValue_Enum : public FFlowDataPinValue
208208
{
209209
GENERATED_BODY()
@@ -299,7 +299,7 @@ struct FFlowDataPinValue_Enum : public FFlowDataPinValue
299299
//======================================================================
300300
// Vector
301301
//======================================================================
302-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Vector - Flow DataPin Value", meta = (FlowPinType = "Vector", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructVector"))
302+
USTRUCT(BlueprintType, DisplayName = "Vector - Flow DataPin Value", meta = (FlowPinType = "Vector", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructVector"))
303303
struct FFlowDataPinValue_Vector : public FFlowDataPinValue
304304
{
305305
GENERATED_BODY()
@@ -322,7 +322,7 @@ struct FFlowDataPinValue_Vector : public FFlowDataPinValue
322322
//======================================================================
323323
// Rotator
324324
//======================================================================
325-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Rotator - Flow DataPin Value", meta = (FlowPinType = "Rotator", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructRotator"))
325+
USTRUCT(BlueprintType, DisplayName = "Rotator - Flow DataPin Value", meta = (FlowPinType = "Rotator", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructRotator"))
326326
struct FFlowDataPinValue_Rotator : public FFlowDataPinValue
327327
{
328328
GENERATED_BODY()
@@ -345,7 +345,7 @@ struct FFlowDataPinValue_Rotator : public FFlowDataPinValue
345345
//======================================================================
346346
// Transform
347347
//======================================================================
348-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Transform - Flow DataPin Value", meta = (FlowPinType = "Transform", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructTransform"))
348+
USTRUCT(BlueprintType, DisplayName = "Transform - Flow DataPin Value", meta = (FlowPinType = "Transform", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructTransform"))
349349
struct FFlowDataPinValue_Transform : public FFlowDataPinValue
350350
{
351351
GENERATED_BODY()
@@ -368,7 +368,7 @@ struct FFlowDataPinValue_Transform : public FFlowDataPinValue
368368
//======================================================================
369369
// GameplayTag
370370
//======================================================================
371-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "GameplayTag - Flow DataPin Value", meta = (FlowPinType = "GameplayTag", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructGameplayTag"))
371+
USTRUCT(BlueprintType, DisplayName = "GameplayTag - Flow DataPin Value", meta = (FlowPinType = "GameplayTag", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructGameplayTag"))
372372
struct FFlowDataPinValue_GameplayTag : public FFlowDataPinValue
373373
{
374374
GENERATED_BODY()
@@ -391,7 +391,7 @@ struct FFlowDataPinValue_GameplayTag : public FFlowDataPinValue
391391
//======================================================================
392392
// GameplayTagContainer
393393
//======================================================================
394-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "GameplayTagContainer - Flow DataPin Value", meta = (FlowPinType = "GameplayTagContainer", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructGameplayTagContainer"))
394+
USTRUCT(BlueprintType, DisplayName = "GameplayTagContainer - Flow DataPin Value", meta = (FlowPinType = "GameplayTagContainer", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructGameplayTagContainer"))
395395
struct FFlowDataPinValue_GameplayTagContainer : public FFlowDataPinValue
396396
{
397397
GENERATED_BODY()
@@ -416,7 +416,7 @@ struct FFlowDataPinValue_GameplayTagContainer : public FFlowDataPinValue
416416
//======================================================================
417417
// InstancedStruct
418418
//======================================================================
419-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "InstancedStruct - Flow DataPin Value", meta = (FlowPinType = "InstancedStruct", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructInstancedStruct"))
419+
USTRUCT(BlueprintType, DisplayName = "InstancedStruct - Flow DataPin Value", meta = (FlowPinType = "InstancedStruct", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructInstancedStruct"))
420420
struct FFlowDataPinValue_InstancedStruct : public FFlowDataPinValue
421421
{
422422
GENERATED_BODY()
@@ -438,7 +438,7 @@ struct FFlowDataPinValue_InstancedStruct : public FFlowDataPinValue
438438
//======================================================================
439439
// Object
440440
//======================================================================
441-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Object - Flow DataPin Value", meta = (FlowPinType = "Object", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructObject"))
441+
USTRUCT(BlueprintType, DisplayName = "Object - Flow DataPin Value", meta = (FlowPinType = "Object", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructObject"))
442442
struct FFlowDataPinValue_Object : public FFlowDataPinValue
443443
{
444444
GENERATED_BODY()
@@ -468,7 +468,7 @@ struct FFlowDataPinValue_Object : public FFlowDataPinValue
468468
//======================================================================
469469
// Class
470470
//======================================================================
471-
USTRUCT(MinimalApi, BlueprintType, DisplayName = "Class - Flow DataPin Value", meta = (FlowPinType = "Class", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructClass"))
471+
USTRUCT(BlueprintType, DisplayName = "Class - Flow DataPin Value", meta = (FlowPinType = "Class", HasNativeMake = "/Script/Flow.FlowDataPinBlueprintLibrary.MakeStructClass"))
472472
struct FFlowDataPinValue_Class : public FFlowDataPinValue
473473
{
474474
GENERATED_BODY()

‎Source/FlowEditor/Private/Graph/Widgets/SFlowGraphNode.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,13 @@ void SFlowGraphNode::UpdateGraphNode()
375375
.IsGraphNodeHovered(this, &SGraphNode::IsHovered);
376376

377377
GetOrAddSlot(ENodeZone::TopCenter)
378+
#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
379+
.SlotOffset(TAttribute<FVector2D>(CommentBubble.Get(), &SCommentBubble::GetOffset))
380+
.SlotSize(TAttribute<FVector2D>(CommentBubble.Get(), &SCommentBubble::GetSize))
381+
#else
378382
.SlotOffset2f(TAttribute<FVector2f>(CommentBubble.Get(), &SCommentBubble::GetOffset2f))
379383
.SlotSize2f(TAttribute<FVector2f>(CommentBubble.Get(), &SCommentBubble::GetSize2f))
384+
#endif
380385
.AllowScaling(TAttribute<bool>(CommentBubble.Get(), &SCommentBubble::IsScalingAllowed))
381386
.VAlign(VAlign_Top)
382387
[

0 commit comments

Comments
 (0)