refactor(Unreal): changes needed for exporting (#11211) e81cd3baba

blakdragan7 · blakdragan7 · blakdragan7 · commit ef821b59b84f · 2025-12-03T02:01:29.000Z
changes needed for exporting

Co-authored-by: Jonathon Copeland &lt;jcopela4@gmail.com&gt;
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-8544f4a98cdd7a99b0ab6af23bde7154b10c6cc2
+e81cd3babadfce5303274e07b59fbd0354840f62
diff --git a/Source/Rive/Private/Rive/RiveRenderTarget2D.cpp b/Source/Rive/Private/Rive/RiveRenderTarget2D.cpp
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #include "Rive/RiveRenderTarget2D.h"
 #include "Rive/RiveArtboard.h"
diff --git a/Source/Rive/Public/Rive/RiveRenderTarget2D.h b/Source/Rive/Public/Rive/RiveRenderTarget2D.h
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #pragma once
 
@@ -32,7 +32,7 @@ class RIVE_API URiveRenderTarget2D : public UTextureRenderTarget2D
 
     virtual void PostLoad() override;
 
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Testing")
     void DrawTestClear();
 
     UFUNCTION()
diff --git a/Source/Rive/Public/Rive/RiveTexture.h b/Source/Rive/Public/Rive/RiveTexture.h
@@ -5,6 +5,7 @@
 #include "CoreMinimal.h"
 #include "RiveArtboard.h"
 #include "Engine/Texture2DDynamic.h"
+#include "RenderResource.h"
 #include "RiveTexture.generated.h"
 
 class URiveArtboard;
diff --git a/Source/Rive/Public/Rive/RiveViewModel.h b/Source/Rive/Public/Rive/RiveViewModel.h
@@ -56,56 +56,56 @@ class RIVE_API URiveViewModel : public UObject, public INotifyFieldValueChanged
     // check HasDefaultValues() before using these or the value returned may be
     // incorrect.
 
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool GetBoolValue(const FString& PropertyName, bool& OutValue) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool GetColorValue(const FString& PropertyName,
                        FLinearColor& OutColor) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool GetStringValue(const FString& PropertyName, FString& OutString) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool GetEnumValue(const FString& PropertyName, FString& EnumValue) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool GetNumberValue(const FString& PropertyName, float& OutNumber) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool GetListSize(const FString& PropertyName, int32& OutSize) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool ContainsListsByName(const FString& ListName) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     // This is a copy that you get. So do not expect to be able to modify the
     // list value here.
     bool GetListByName(const FString ListName, FRiveList& OutList) const;
-    UFUNCTION(BlueprintPure)
+    UFUNCTION(BlueprintPure, Category = "Rive|Data Binding")
     bool ContainsLists(FRiveList InList) const;
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetBoolValue(const FString& PropertyName, bool InValue);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetColorValue(const FString& PropertyName, FLinearColor InColor);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetStringValue(const FString& PropertyName, const FString& InString);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetEnumValue(const FString& PropertyName, const FString& InEnumValue);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetNumberValue(const FString& PropertyName, float InNumber);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetImageValue(const FString& PropertyName, UTexture* InImage);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetArtboardValue(const FString& PropertyName,
                           URiveArtboard* InArtboard);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool SetViewModelValue(const FString& PropertyName,
                            URiveViewModel* InViewModel);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool AppendToList(const FString& ListName, URiveViewModel* Value);
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool InsertToList(const FString& ListName,
                       int32 Index,
                       URiveViewModel* Value);
 
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool RemoveFromList(const FString& ListName, URiveViewModel* Value);
 
-    UFUNCTION(BlueprintCallable)
+    UFUNCTION(BlueprintCallable, Category = "Rive|Data Binding")
     bool RemoveFromListAtIndex(const FString& ListName, int32 Index);
 
     UFUNCTION(BlueprintCallable,
@@ -125,25 +125,25 @@ class RIVE_API URiveViewModel : public UObject, public INotifyFieldValueChanged
         FFieldValueChangedDynamicDelegate Delegate);
 
     UFUNCTION(BlueprintCallable,
-              Category = "Lists",
+              Category = "Rive|Data Binding|Lists",
               meta = (DisplayName = "Append View Model At End Of List",
                       ScriptName = "AppendToList"))
     void K2_AppendToList(FRiveList List, URiveViewModel* Value);
 
     UFUNCTION(BlueprintCallable,
-              Category = "Lists",
+              Category = "Rive|Data Binding|Lists",
               meta = (DisplayName = "Insert View Model Into List",
                       ScriptName = "InsertToList"))
     void K2_InsertToList(FRiveList List, int32 Index, URiveViewModel* Value);
 
     UFUNCTION(BlueprintCallable,
-              Category = "Lists",
+              Category = "Rive|Data Binding|Lists",
               meta = (DisplayName = "Remove View Model From List",
                       ScriptName = "RemoveFromList"))
     void K2_RemoveFromList(FRiveList List, URiveViewModel* Value);
 
     UFUNCTION(BlueprintCallable,
-              Category = "Lists",
+              Category = "Rive|Data Binding|Lists",
               meta = (DisplayName = "Remove View Model From List At Index",
                       ScriptName = "RemoveFromListAtIndex"))
     void K2_RemoveFromListAtIndex(FRiveList List, int32 Index);
diff --git a/Source/RiveEditorNodes/Private/K2Node_MakeArtboard.cpp b/Source/RiveEditorNodes/Private/K2Node_MakeArtboard.cpp
@@ -1,4 +1,6 @@
-﻿#include "K2Node_MakeArtboard.h"
+﻿// Copyright 2024, 2025 Rive, Inc. All rights reserved.
+
+#include "K2Node_MakeArtboard.h"
 
 #include "BlueprintActionDatabaseRegistrar.h"
 #include "BlueprintNodeSpawner.h"
diff --git a/Source/RiveEditorNodes/Private/K2Node_MakeArtboardViewModel.cpp b/Source/RiveEditorNodes/Private/K2Node_MakeArtboardViewModel.cpp
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #include "K2Node_MakeArtboardViewModel.h"
 #include "K2Node_CallFunction.h"
diff --git a/Source/RiveEditorNodes/Private/K2Node_MakeViewModel.cpp b/Source/RiveEditorNodes/Private/K2Node_MakeViewModel.cpp
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #include "K2Node_MakeViewModel.h"
 
diff --git a/Source/RiveEditorNodes/Private/K2Node_MakeViewModelBase.cpp b/Source/RiveEditorNodes/Private/K2Node_MakeViewModelBase.cpp
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #include "K2Node_MakeViewModelBase.h"
 
diff --git a/Source/RiveEditorNodes/Private/Logs/LogRiveNode.cpp b/Source/RiveEditorNodes/Private/Logs/LogRiveNode.cpp
@@ -1,3 +1,5 @@
-﻿#include "LogRiveNode.h"
+﻿// Copyright 2024, 2025 Rive, Inc. All rights reserved.
+
+#include "LogRiveNode.h"
 
 DEFINE_LOG_CATEGORY(LogRiveNode);
diff --git a/Source/RiveEditorNodes/Private/PinTools.cpp b/Source/RiveEditorNodes/Private/PinTools.cpp
@@ -1,3 +1,3 @@
-﻿// Fill out your copyright notice in the Description page of Project Settings.
+﻿// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #include "PinTools.h"
diff --git a/Source/RiveEditorNodes/Private/PinTools.h b/Source/RiveEditorNodes/Private/PinTools.h
@@ -1,4 +1,4 @@
-﻿// Fill out your copyright notice in the Description page of Project Settings.
+﻿// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #pragma once
 
diff --git a/Source/RiveEditorNodes/Public/K2Node_MakeArtboardViewModel.h b/Source/RiveEditorNodes/Public/K2Node_MakeArtboardViewModel.h
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #pragma once
 
diff --git a/Source/RiveEditorNodes/Public/K2Node_MakeViewModel.h b/Source/RiveEditorNodes/Public/K2Node_MakeViewModel.h
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #pragma once
 
diff --git a/Source/RiveEditorNodes/Public/K2Node_MakeViewModelBase.h b/Source/RiveEditorNodes/Public/K2Node_MakeViewModelBase.h
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
 
 #pragma once
 
diff --git a/Source/RiveRenderer/Private/RiveCommandBuilder.cpp b/Source/RiveRenderer/Private/RiveCommandBuilder.cpp
@@ -1,3 +1,5 @@
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
+
 #include "RiveCommandBuilder.h"
 
 #include "RiveRenderer.h"
diff --git a/Source/RiveRenderer/Public/RiveCommandBuilder.h b/Source/RiveRenderer/Public/RiveCommandBuilder.h
@@ -1,3 +1,5 @@
+// Copyright 2024, 2025 Rive, Inc. All rights reserved.
+
 #pragma once
 #include "CoreMinimal.h"
 #include "Engine/Texture2D.h"
diff --git a/Source/RiveRenderer/Public/RiveRenderTarget.h b/Source/RiveRenderer/Public/RiveRenderTarget.h
@@ -4,6 +4,9 @@
 
 #include "CoreMinimal.h"
 #include "UObject/ObjectPtr.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "UnrealClient.h"
+#include "RenderGraphResources.h"
 
 #if WITH_RIVE
 
diff --git a/Source/RiveRenderer/Public/RiveTypeConversions.h b/Source/RiveRenderer/Public/RiveTypeConversions.h
@@ -1,4 +1,6 @@
-﻿#pragma once
+﻿// Copyright 2024, 2025 Rive, Inc. All rights reserved.
+
+#pragma once
 
 #include "RiveTypes.h"
 THIRD_PARTY_INCLUDES_START

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-8544f4a98cdd7a99b0ab6af23bde7154b10c6cc2`
	`1`	`+e81cd3babadfce5303274e07b59fbd0354840f62`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Fill out your copyright notice in the Description page of Project Settings.`
	`1`	`+// Copyright 2024, 2025 Rive, Inc. All rights reserved.`
`2`	`2`
`3`	`3`	`#include "Rive/RiveRenderTarget2D.h"`
`4`	`4`	`#include "Rive/RiveArtboard.h"`