MAYA-126772 Live Link git.autodesk.com repository updated to Unreal E…

…ngine 5.1 release branch (#18) Sync with internal repo version 2.2.0
Autodesk · Mar 2, 2023 · 42472e7 · 42472e7
1 parent 9e190e3
commit 42472e7
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,9 +57,13 @@ Extras/
 
 **/Intermediate/*
 **/Build/*
+**/Installer/*
 
 *.aps
 
 # CMake specific files
 build/*
-.env
+.env
+
+# MayaUnrealLiveLinkPluginUI.py is now the result of UE version replacement from MayaUnrealLiveLinkPluginUI.py.in
+Source/Programs/MayaUnrealLiveLinkPlugin/MayaUnrealLiveLinkPluginUI.py
diff --git a/Plugins/Runtime/MayaLiveLink/MayaLiveLink.uplugin b/Plugins/Runtime/MayaLiveLink/MayaLiveLink.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.1.999",
+	"VersionName": "2.2.0",
 	"FriendlyName": "Maya Live Link",
 	"Description": "Maya Live Link allows streaming of animated data into the Unreal Editor",
 	"Category": "Animation",
@@ -27,7 +27,7 @@
 		},
 		{
 			"Name": "MayaLiveLinkInterface",
-			"Type": "Runtime",
+			"Type": "Editor",
 			"LoadingPhase": "PreDefault"
 		}
 	],

diff --git a/Plugins/Runtime/MayaLiveLink/Source/MayaLiveLink/Private/MayaLiveLinkMessageBusSource.cpp b/Plugins/Runtime/MayaLiveLink/Source/MayaLiveLink/Private/MayaLiveLinkMessageBusSource.cpp
@@ -245,7 +245,7 @@ void FMayaLiveLinkMessageBusSource::HandleListAssetsRequest(const FMayaLiveLinkL
 				for (auto& AssetData : OutAssetData)
 				{
 					auto& Class = AssetsByClass.FindOrAdd(AssetData.AssetClassPath.ToString());
-					Class.Array.Add(AssetData.ObjectPath.ToString());
+					Class.Array.Add(AssetData.GetSoftObjectPath().ToString());
 				}
 			}
 		}
@@ -293,7 +293,7 @@ void FMayaLiveLinkMessageBusSource::HandleListAnimSequenceSkeletonRequest(const
 
 					// Retrieve the list of AnimSequences for this skeleton
 					FStringArray& Class = ReturnMessage->AnimSequencesBySkeleton.FindOrAdd(SkeletonName);
-					FString ObjectPath = AssetData.ObjectPath.ToString();
+					FString ObjectPath = AssetData.GetSoftObjectPath().ToString();
 
 					// Strip the "." part
 					int32 Index = 0;

diff --git a/Plugins/Runtime/MayaLiveLink/Source/MayaLiveLinkInterface/Private/MayaLiveLinkInterface.cpp b/Plugins/Runtime/MayaLiveLink/Source/MayaLiveLinkInterface/Private/MayaLiveLinkInterface.cpp
@@ -32,7 +32,7 @@ IMPLEMENT_MODULE(FMayaLiveLinkInterfaceModule, MayaLiveLinkInterface)
 
 namespace
 {
-	static const FString PluginVersion = "v2.1.999";
+	static const FString PluginVersion = "v2.2.0";
 	static const FString UnrealEngineVersion = VERSION_STRINGIFY(ENGINE_MAJOR_VERSION) TEXT(".") VERSION_STRINGIFY(ENGINE_MINOR_VERSION);
 }
 

diff --git a/...Runtime/MayaLiveLink/Source/MayaLiveLinkTimelineSync/Private/MayaLiveLinkTimelineSync.cpp b/...Runtime/MayaLiveLink/Source/MayaLiveLinkTimelineSync/Private/MayaLiveLinkTimelineSync.cpp
@@ -63,7 +63,7 @@ void FMayaLiveLinkTimelineSyncModule::StartupModule()
 	bSetGlobalTime = false;
 	bIgnoreTimeChange = false;
 	bBlockTimeChangeFeedback = true;
-	LastFrameTime.Time.FrameNumber.Value = -1;
+	LastFrameTime.Time.FrameNumber.Value = 0;
 
 	// Hook on when the sequencer editor is created
 	ISequencerModule& SequencerModule = FModuleManager::Get().LoadModuleChecked<ISequencerModule>(TEXT("Sequencer"));
@@ -182,7 +182,7 @@ void FMayaLiveLinkTimelineSyncModule::OnSequencerTimeChanged(TWeakPtr<ISequencer
 void FMayaLiveLinkTimelineSyncModule::OnAnimSequenceEditorPreviewSceneCreated(const TSharedRef<IPersonaPreviewScene>& InPreviewScene)
 {
 	bAnimSequenceEditorTimeSync = false;
-	LastFrameTime.Time.FrameNumber = -1;
+	LastFrameTime.Time.FrameNumber = 0;
 	WeakPreviewScene = TWeakPtr<IPersonaPreviewScene>(InPreviewScene);
 
 	// Hook on when the viewport is redrawn

diff --git a/Source/Programs/MayaUnrealLiveLinkPlugin/MayaUnrealLiveLinkPlugin.mod b/Source/Programs/MayaUnrealLiveLinkPlugin/MayaUnrealLiveLinkPlugin.mod
@@ -20,14 +20,14 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. -->
 
-+ MAYAVERSION:2023 LiveLink 2.1 ./2023
++ MAYAVERSION:2023 LiveLink 2.2 ./2023
 plug-ins: .
 scripts: .
 
-+ MAYAVERSION:2022 LiveLink 2.1 ./2022
++ MAYAVERSION:2022 LiveLink 2.2 ./2022
 plug-ins: .
 scripts: .
 
-+ MAYAVERSION:2020 LiveLink 2.1 ./2020
++ MAYAVERSION:2020 LiveLink 2.2 ./2020
 plug-ins: .
 scripts: .
diff --git a/Source/Programs/MayaUnrealLiveLinkPlugin/MayaUnrealLiveLinkPluginUI.py.in b/Source/Programs/MayaUnrealLiveLinkPlugin/MayaUnrealLiveLinkPluginUI.py.in
@@ -1068,7 +1068,7 @@ def onSelectionChanged(*args, **kwargs):
 
 # Initialize the script plug-in
 def initializePlugin(mobject):
-    mplugin = OpenMayaMPx.MFnPlugin(mobject, 'Autodesk, Inc.', 'v2.1.999')
+    mplugin = OpenMayaMPx.MFnPlugin(mobject, 'Autodesk, Inc.', 'v2.2.0')
 
     print("LiveLinkUI Init:")
     for Command in Commands:

diff --git a/resource/copyright.txt b/resource/copyright.txt
@@ -1,4 +1,4 @@
-Unreal� Live Link for Autodesk � Maya � 2.1.999
+Unreal� Live Link for Autodesk � Maya � 2.2.0
 
 � 2022 Autodesk, Inc.  All rights reserved.