fix(unreal): several fixes needed for polish (#11210) 8544f4a98c

* serveral fixes

* not needed file

Co-authored-by: Jonathon Copeland <jcopela4@gmail.com>

Author: blakdragan7

.rive_head

@@ -1 +1 @@
-f38d54d8e466ed5cb2ba1246bc79510ceaa5e6cf
+8544f4a98cdd7a99b0ab6af23bde7154b10c6cc2

Source/Rive/Private/Slate/SRiveLeafWidget.cpp

@@ -278,6 +278,10 @@ int32 SRiveLeafWidget::OnPaint(const FPaintArgs& Args,
     if (!bParentEnabled)
         return LayerId;
 
+    // Don't try to draw if we don't have an artboard.
+    if (!Artboard.IsValid())
+        return LayerId;
+
     RiveRendererDrawElement->SetRenderingBounds(
         AllottedGeometry.GetRenderBoundingRect());
     RiveRendererDrawElement->SetClipRect(MyCullingRect);

Source/RiveEditor/Private/Factories/RiveActorFactory.cpp

@@ -40,7 +40,8 @@ URiveRenderTarget2D* FRiveRenderTargetFactory::CreateRenderTarget()
 
     RiveRenderTarget2D->RiveDescriptor.RiveFile = RiveFile;
 
-    RiveRenderTarget2D->InitAutoFormat(256, 256);
+    RiveRenderTarget2D->bSupportsUAV = true;
+    RiveRenderTarget2D->InitCustomFormat(256, 256, PF_R8G8B8A8, false);
     RiveRenderTarget2D->InitRiveRenderTarget2D();
 
     return RiveRenderTarget2D;

Source/RiveEditor/Private/Factories/RiveActorFactory.h

@@ -99,10 +99,21 @@ bool FRiveWidgetFactory::CreateWidgetStructure(
 
         if (URiveWidget* RiveWidget = Cast<URiveWidget>(Widget))
         {
+            FString StateMachineName = "";
+            FString ArtboardName = "";
+
+            if (RiveFile->ArtboardDefinitions.Num())
+            {
+                ArtboardName = RiveFile->ArtboardDefinitions[0].Name;
+                if (RiveFile->ArtboardDefinitions[0].StateMachineNames.Num())
+                    StateMachineName =
+                        RiveFile->ArtboardDefinitions[0].StateMachineNames[0];
+            }
+
             RiveWidget->RiveDescriptor =
                 FRiveDescriptor{RiveFile,
-                                "",
-                                "",
+                                ArtboardName,
+                                StateMachineName,
                                 false,
                                 ERiveFitType::Contain,
                                 ERiveAlignment::Center};
@@ -215,75 +226,4 @@ bool FRiveWidgetFactory::Create()
     return true;
 }
 
-namespace
-{
-static void SpawnRiveWidgetActor(const FToolMenuContext& MenuContext)
-{
-    if (const UContentBrowserAssetContextMenuContext* Context =
-            UContentBrowserAssetContextMenuContext::FindContextWithAssets(
-                MenuContext))
-    {
-        TArray<URiveFile*> RiveFiles =
-            Context->LoadSelectedObjects<URiveFile>();
-        for (URiveFile* RiveFile : RiveFiles)
-        {
-            if (UWorld* World = GEditor->GetEditorWorldContext().World())
-            {
-                ARiveWidgetActor* NewActor =
-                    Cast<ARiveWidgetActor>(World->SpawnActor<ARiveWidgetActor>(
-                        FVector::ZeroVector,
-                        FRotator::ZeroRotator,
-                        FActorSpawnParameters()));
-
-                if (NewActor)
-                {
-                    NewActor->SetWidgetClass(URiveWidget::StaticClass());
-                }
-            }
-        }
-    }
-}
-
-static FDelayedAutoRegisterHelper DelayedAutoRegister(
-    EDelayedRegisterRunPhase::EndOfEngineInit,
-    [] {
-        UToolMenus::RegisterStartupCallback(
-            FSimpleMulticastDelegate::FDelegate::CreateLambda([]() {
-                FToolMenuOwnerScoped OwnerScoped(UE_MODULE_NAME);
-                UToolMenu* Menu =
-                    UE::ContentBrowser::ExtendToolMenu_AssetContextMenu(
-                        URiveFile::StaticClass());
-
-                FToolMenuSection& Section =
-                    Menu->FindOrAddSection("GetAssetActions");
-                Section.AddDynamicEntry(
-                    TEXT("Rive"),
-                    FNewToolMenuSectionDelegate::CreateLambda(
-                        [](FToolMenuSection& InSection) {
-                            {
-                                const TAttribute<FText> Label =
-                                    LOCTEXT("RiveFile_SpawnRiveWidget",
-                                            "Spawn Rive Widget Actor");
-                                const TAttribute<FText> ToolTip =
-                                    LOCTEXT("RiveFile_SpawnRiveWidgetTooltip",
-                                            "Spawn Rive Widget Actors.");
-                                const FSlateIcon Icon =
-                                    FSlateIcon(FAppStyle::GetAppStyleSetName(),
-                                               "ClassIcon.Texture2D");
-                                const FToolMenuExecuteAction UIAction =
-                                    FToolMenuExecuteAction::CreateStatic(
-                                        &SpawnRiveWidgetActor);
-
-                                InSection.AddMenuEntry(
-                                    "RiveFile_SpawnRiveWidget",
-                                    Label,
-                                    ToolTip,
-                                    Icon,
-                                    UIAction);
-                            }
-                        }));
-            }));
-    });
-} // namespace
-
 #undef LOCTEXT_NAMESPACE