From ce81efb239c531fd93fc2cbd2c5ec5005f21437a Mon Sep 17 00:00:00 2001 From: Behron Date: Wed, 9 Apr 2025 19:32:57 -0600 Subject: [PATCH] Added the fixes for the render target save to disk functions More merge conflicts --- .idea/.idea.Luckyrobots/.idea/workspace.xml | 107 +----------------- .../Blueprint/component/BPC_Capture.uasset | 4 +- .../BP_DJI_DroneMovementBluePrint.uasset | 4 +- .../vehicle/StretchRobot_vehicle_BP.uasset | 4 +- 4 files changed, 10 insertions(+), 109 deletions(-) diff --git a/.idea/.idea.Luckyrobots/.idea/workspace.xml b/.idea/.idea.Luckyrobots/.idea/workspace.xml index 402110ef..b640a133 100644 --- a/.idea/.idea.Luckyrobots/.idea/workspace.xml +++ b/.idea/.idea.Luckyrobots/.idea/workspace.xml @@ -14,110 +14,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/Content/Blueprint/component/BPC_Capture.uasset b/Content/Blueprint/component/BPC_Capture.uasset index abd113aa..647cc78f 100644 --- a/Content/Blueprint/component/BPC_Capture.uasset +++ b/Content/Blueprint/component/BPC_Capture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb697082f177e674aa3f0cc2f24c06d6978cb314bc366d0e9893cc6752ab7cf4 -size 659775 +oid sha256:03438ffbd5208b594fcbdc83edf9f958d369a14b7c20e604d1c9aa73306e8033 +size 655290 diff --git a/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset b/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset index c23500fe..0716c448 100644 --- a/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset +++ b/Content/Blueprint/oldRobotsBP/BP_DJI_DroneMovementBluePrint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96cd1e93e22315baa58c5ef1b3f6c96487f6ef6e433c85eae920c709311af558 -size 1775276 +oid sha256:d916d48c42a74b6a3bc2ea1b449da346b02ca0437b427dd332f29c29cfe10f27 +size 1794366 diff --git a/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset b/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset index 662e8d2a..0ff66462 100644 --- a/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset +++ b/Content/Blueprint/vehicle/StretchRobot_vehicle_BP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2220768fb3b0e7ce7a277a8998772c1cda5e275e418c1b376615b63a4c14c4e -size 3005466 +oid sha256:f675a84720f2cfc9ad0a5bf91a489b6f79565377bea86dea08ffe40e0ca02bb2 +size 3010351